diff options
| author | 2017-06-02 11:40:54 +0000 | |
|---|---|---|
| committer | 2017-06-02 11:40:56 +0000 | |
| commit | b4fe268625d881315002be75e6f71eb49cc6da5c (patch) | |
| tree | c84337cc94daf3a5bdbc79409796ca083903e1d0 | |
| parent | cff1b21b3e19c5d3a2d726fdb60dacd7de2a6f0d (diff) | |
| parent | 72a75f7d6878ef46437098a94066c14e91e00216 (diff) | |
Merge "Fix build failure in scheduler_arm with ART_USE_OLD_ARM_BACKEND=1"
| -rw-r--r-- | compiler/optimizing/scheduler_arm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/optimizing/scheduler_arm.h b/compiler/optimizing/scheduler_arm.h index 8d5e4f375b..cb679fcd2d 100644 --- a/compiler/optimizing/scheduler_arm.h +++ b/compiler/optimizing/scheduler_arm.h @@ -17,7 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_SCHEDULER_ARM_H_ #define ART_COMPILER_OPTIMIZING_SCHEDULER_ARM_H_ +#ifdef ART_USE_OLD_ARM_BACKEND +#include "code_generator_arm.h" +#else #include "code_generator_arm_vixl.h" +#endif #include "scheduler.h" namespace art { |