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

am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"

Browse Source 
* commit 'e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
  Only enable WITH_DEXPREOPT by default for libdvm.so
This commit is contained in:
Brian Carlstrom
2014-05-29 19:40:02 +00:00
committed by Android Git Automerger
parent 2267c22b3d e0df9d9577
commit ab6f84e3d1
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 :=
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 ($(DALVIK_VM_LIB),libdvm.so)
ifeq ($(user_variant),user)
ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true
endif
endif
endif
endif
# Disallow mock locations by default for user builds
ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0