diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-29 16:37:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-29 16:37:20 +0000 |
| commit | e469ea36ffa88a4ee7e2a63228eae8be9e7083fb (patch) | |
| tree | 40488c73ffdbef2d9c2ea8aad2280066f42c1d99 /core/main.mk | |
| parent | 5da48a33942f4378b64bca95d54e32b19ee07695 (diff) | |
| parent | 9f8e214a919097284a88cb19a1b85ceafc202a67 (diff) | |
| download | build-e469ea36ffa88a4ee7e2a63228eae8be9e7083fb.zip build-e469ea36ffa88a4ee7e2a63228eae8be9e7083fb.tar.gz build-e469ea36ffa88a4ee7e2a63228eae8be9e7083fb.tar.bz2 | |
am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so
* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
Only enable WITH_DEXPREOPT by default for libdvm.so
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/main.mk b/core/main.mk index e8169fc..6dbc8a6 100644 --- a/core/main.mk +++ b/core/main.mk @@ -330,13 +330,15 @@ ifneq (,$(user_variant)) enable_target_debugging := endif - # Turn on Dalvik preoptimization for user builds, but only if not + # Turn on Dalvik preoptimization for libdvm.so 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 ($(user_variant),user) - ifeq ($(HOST_OS),linux) - WITH_DEXPREOPT := true + ifeq ($(DALVIK_VM_LIB),libdvm.so) + ifeq ($(user_variant),user) + ifeq ($(HOST_OS),linux) + WITH_DEXPREOPT := true + endif endif endif endif |