Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master

Change-Id: I0731a0f623694d15d311dae1450a50e105905421

diff --combined vm/compiler/codegen/arm/armv7-a/Codegen.c
index 1514d55,9626492..dab3579
--- 1/vm/compiler/codegen/arm/armv7-a/Codegen.c
--- 2/vm/compiler/codegen/arm/armv7-a/Codegen.c
+++ b/vm/compiler/codegen/arm/armv7-a/Codegen.c
@@@ -15,6 -15,7 +15,7 @@@
   */
  #define _CODEGEN_C
  #define _ARMV7_A
 -#define TGT_LIR
++#define TGT_LIR ArmLIR
  
  #include "Dalvik.h"
  #include "interp/InterpDefs.h"
@@@ -23,18 -24,20 +24,20 @@@
  #include "compiler/CompilerInternals.h"
  #include "compiler/codegen/arm/ArmLIR.h"
  #include "mterp/common/FindInterface.h"
- #include "compiler/codegen/arm/Ralloc.h"
+ #include "compiler/codegen/Ralloc.h"
  #include "compiler/codegen/arm/Codegen.h"
  #include "compiler/Loop.h"
  #include "ArchVariant.h"
  
- /* Architectural independent building blocks */
+ /* Arm codegen building blocks */
  #include "../CodegenCommon.c"
  
  /* Thumb2-specific factory utilities */
  #include "../Thumb2/Factory.c"
- /* Factory utilities dependent on arch-specific features */
- #include "../CodegenFactory.c"
+ /* Target independent factory utilities */
+ #include "../../CodegenFactory.c"
+ /* Arm-specific factory utilities */
+ #include "../ArchFactory.c"
  
  /* Thumb2-specific codegen routines */
  #include "../Thumb2/Gen.c"