diff options
| author | Ying Wang <wangying@google.com> | 2014-12-16 21:47:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 21:47:13 +0000 |
| commit | 912da64598a5175d6e5868c22977eda95f2a9df1 (patch) | |
| tree | 76d95c503daa22d6faf6fe895c57792c76d5abe3 /core/main.mk | |
| parent | c38439a5fff55322900948cb36c2cf6f38b50bb3 (diff) | |
| parent | 73a730caf566fb778ad36f6d991666c482918d22 (diff) | |
| download | build-912da64598a5175d6e5868c22977eda95f2a9df1.tar.gz build-912da64598a5175d6e5868c22977eda95f2a9df1.tar.bz2 build-912da64598a5175d6e5868c22977eda95f2a9df1.zip | |
am 73a730ca: Merge "Remove libdvm support from the core build system."
* commit '73a730caf566fb778ad36f6d991666c482918d22':
Remove libdvm support from the core build system.
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/main.mk b/core/main.mk index 53df32c06..4fbd01e2f 100644 --- a/core/main.mk +++ b/core/main.mk @@ -307,6 +307,7 @@ endif # Add build properties for ART. These define system properties used by installd # to pass flags to dex2oat. +ADDITIONAL_BUILD_PROPERTIES += persist.sys.dalvik.vm.lib.2=libart ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).variant=$(DEX2OAT_TARGET_CPU_VARIANT) ifneq ($(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),) ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) @@ -336,15 +337,14 @@ ifneq (,$(user_variant)) enable_target_debugging := endif - # Turn on Dalvik preoptimization for libdvm.so user builds, but only if not + # Turn on Dalvik preoptimization for user builds, but only if not # explicitly disabled and the build is running on Linux (since host # Dalvik isn't built for non-Linux hosts). ifeq (,$(WITH_DEXPREOPT)) - ifeq ($(DALVIK_VM_LIB),libdvm.so) - ifeq ($(user_variant),user) - ifeq ($(HOST_OS),linux) - WITH_DEXPREOPT := true - endif + ifeq ($(user_variant),user) + ifeq ($(HOST_OS),linux) + # TODO: turn on WITH_DEXPREOPT for libart user builds. + # WITH_DEXPREOPT := true endif endif endif |