am e0df9d95
: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"
* commit 'e0df9d9577c19975adbf6e5a3489946c8f91ad1e': Only enable WITH_DEXPREOPT by default for libdvm.so
This commit is contained in:
commit
ab6f84e3d1
1 changed files with 6 additions and 4 deletions
10
core/main.mk
10
core/main.mk
|
@ -334,13 +334,15 @@ 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 ($(user_variant),user)
|
ifeq ($(DALVIK_VM_LIB),libdvm.so)
|
||||||
ifeq ($(HOST_OS),linux)
|
ifeq ($(user_variant),user)
|
||||||
WITH_DEXPREOPT := true
|
ifeq ($(HOST_OS),linux)
|
||||||
|
WITH_DEXPREOPT := true
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue