diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-29 19:40:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-29 19:40:02 +0000 |
| commit | ab6f84e3d1886237e9516ebe4660d8e1042a6a75 (patch) | |
| tree | 24ce3f0cd10559436e2291d48bd5ed3e2dd92398 | |
| parent | 2267c22b3db95fe0a0d94865c9c69cc51b1a5f70 (diff) | |
| parent | e0df9d9577c19975adbf6e5a3489946c8f91ad1e (diff) | |
| download | build-ab6f84e3d1886237e9516ebe4660d8e1042a6a75.zip build-ab6f84e3d1886237e9516ebe4660d8e1042a6a75.tar.gz build-ab6f84e3d1886237e9516ebe4660d8e1042a6a75.tar.bz2 | |
am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit 'e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
Only enable WITH_DEXPREOPT by default for libdvm.so
| -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 b07d5a1..e3b7089 100644 --- a/core/main.mk +++ b/core/main.mk @@ -334,13 +334,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 |