StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only enable WITH_DEXPREOPT by default for libdvm.so

Browse Source 
Bug: 14298175

(cherry picked from commit 9f8e214a91)

Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
This commit is contained in:
Brian Carlstrom
2014-05-28 22:13:07 -07:00
parent 1e60fe58f0
commit 3f5ff08dc5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -334,16 +334,18 @@ ifneq (,$(user_variant))
enable_target_debugging := enable_target_debugging :=
endif 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 # explicitly disabled and the build is running on Linux (since host
# Dalvik isn't built for non-Linux hosts). # Dalvik isn't built for non-Linux hosts).
ifeq (,$(WITH_DEXPREOPT)) ifeq (,$(WITH_DEXPREOPT))
ifeq ($(DALVIK_VM_LIB),libdvm.so)
ifeq ($(user_variant),user) ifeq ($(user_variant),user)
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
endif endif
endif endif
endif endif
endif
# Disallow mock locations by default for user builds # Disallow mock locations by default for user builds
ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0 ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0