resolved conflicts for merge of 57a76b06 to master

Change-Id: If29e5cb05954bf55a24475c249558a8d5a1c391f

diff --cc vm/Android.mk
index 2f2b2d5,3c1c669..c9b510b
--- 1/vm/Android.mk
--- 2/vm/Android.mk
+++ b/vm/Android.mk
@@@ -55,57 -55,36 +55,45 @@@ ifneq ($(strip $(WITH_ADDRESS_SANITIZER
      LOCAL_CFLAGS := $(filter-out $(CLANG_CONFIG_UNKNOWN_CFLAGS),$(LOCAL_CFLAGS))
  endif
  
 +# TODO: split out the asflags.
 +LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
 +
  include $(BUILD_SHARED_LIBRARY)
  
- # If WITH_JIT is configured, build multiple versions of libdvm.so to facilitate
- # correctness/performance bugs triage
- ifeq ($(WITH_JIT),true)
- 
-     # Derivation #1
-     # Enable assert and JIT tuning
-     include $(LOCAL_PATH)/ReconfigureDvm.mk
+ # Derivation #1
+ # Enable assertions and JIT tuning
+ include $(LOCAL_PATH)/ReconfigureDvm.mk
+ LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1 -DLOG_NDEBUG=1 -DWITH_DALVIK_ASSERT \
+                 -DWITH_JIT_TUNING $(target_smp_flag)
++# TODO: split out the asflags.
++LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
+ LOCAL_MODULE := libdvm_assert
+ include $(BUILD_SHARED_LIBRARY)
  
-     # Enable assertions and JIT-tuning
-     LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1 -DLOG_NDEBUG=1 -DWITH_DALVIK_ASSERT \
-                     -DWITH_JIT_TUNING $(target_smp_flag)
-     # TODO: split out the asflags.
-     LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-     LOCAL_MODULE := libdvm_assert
-     include $(BUILD_SHARED_LIBRARY)
+ ifneq ($(dvm_arch),mips)    # MIPS support for self-verification is incomplete
  
-   ifneq ($(dvm_arch),mips)    # MIPS support for self-verification is incomplete
      # Derivation #2
-     # Enable assert and self-verification
-     include $(LOCAL_PATH)/ReconfigureDvm.mk
- 
      # Enable assertions and JIT self-verification
+     include $(LOCAL_PATH)/ReconfigureDvm.mk
      LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1 -DLOG_NDEBUG=1 -DWITH_DALVIK_ASSERT \
                      -DWITH_SELF_VERIFICATION $(target_smp_flag)
 +    # TODO: split out the asflags.
 +    LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
      LOCAL_MODULE := libdvm_sv
      include $(BUILD_SHARED_LIBRARY)
-   endif # dvm_arch!=mips
  
-     # Derivation #3
-     # Compile out the JIT
-     WITH_JIT := false
-     include $(LOCAL_PATH)/ReconfigureDvm.mk
+ endif # dvm_arch!=mips
  
-     LOCAL_CFLAGS += $(target_smp_flag)
-     # TODO: split out the asflags.
-     LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-     LOCAL_MODULE := libdvm_interp
-     include $(BUILD_SHARED_LIBRARY)
+ # Derivation #3
+ # Compile out the JIT
+ WITH_JIT := false
+ include $(LOCAL_PATH)/ReconfigureDvm.mk
+ LOCAL_CFLAGS += $(target_smp_flag)
++# TODO: split out the asflags.
++LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
+ LOCAL_MODULE := libdvm_interp
+ include $(BUILD_SHARED_LIBRARY)
  
-   ifeq ($(dvm_arch),x86)    # For x86, we enable JIT on host too
-     # restore WITH_JIT = true for host dalvik build
-     WITH_JIT := true
-   endif # dvm_arch==x86
- endif
  
  #
  # Build for the host.