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

am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"

Browse Source 
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT
This commit is contained in:
Ying Wang
2014-03-20 20:18:38 +00:00
committed by Android Git Automerger
parent 46d69e9914 c5a563447a
commit 996f3826f7
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/dex_preopt.mk
View File

@@ -71,5 +71,4 @@ endif
else else
$(warning No DALVIK_VM_LIB, disable dexpreopt.) $(warning No DALVIK_VM_LIB, disable dexpreopt.)
WITH_DEXPREOPT := false WITH_DEXPREOPT := false
DISABLE_DEXPREOPT := true
endif # DALVIK_VM_LIB is defined. endif # DALVIK_VM_LIB is defined.

2
core/main.mk
View File

@@ -343,7 +343,7 @@ ifneq (,$(user_variant))
# Turn on Dalvik preoptimization for user builds, but only if not # Turn on Dalvik preoptimization for 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).
ifneq (true,$(DISABLE_DEXPREOPT)) ifeq (,$(WITH_DEXPREOPT))
ifeq ($(user_variant),user) ifeq ($(user_variant),user)
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true

2
target/board/generic_x86/BoardConfig.mk
View File

@@ -24,7 +24,7 @@ BOARD_MALLOC_ALIGNMENT := 16
# Enable dex-preoptimization to speed up the first boot sequence # Enable dex-preoptimization to speed up the first boot sequence
# of an SDK AVD. Note that this operation only works on Linux for now # of an SDK AVD. Note that this operation only works on Linux for now
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT ?= true
endif endif
# Build OpenGLES emulation host and guest libraries # Build OpenGLES emulation host and guest libraries

2
target/board/generic_x86_64/BoardConfig.mk
View File

@@ -30,7 +30,7 @@ BOARD_MALLOC_ALIGNMENT := 16
# Enable dex-preoptimization to speed up the first boot sequence # Enable dex-preoptimization to speed up the first boot sequence
# of an SDK AVD. Note that this operation only works on Linux for now # of an SDK AVD. Note that this operation only works on Linux for now
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true WITH_DEXPREOPT ?= true
endif endif
# disable the emulator # disable the emulator

2
target/board/vbox_x86/BoardConfig.mk
View File

@@ -3,7 +3,6 @@
# #
TARGET_ARCH=x86 TARGET_ARCH=x86
DISABLE_DEXPREOPT := true
TARGET_COMPRESS_MODULE_SYMBOLS := false TARGET_COMPRESS_MODULE_SYMBOLS := false
TARGET_NO_RECOVERY := true TARGET_NO_RECOVERY := true
TARGET_HARDWARE_3D := false TARGET_HARDWARE_3D := false
@@ -32,6 +31,7 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
# Reserve 265M for the system partition # Reserve 265M for the system partition
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456
WITH_DEXPREOPT := false
# The eth0 device should be started with dhcp on boot. # The eth0 device should be started with dhcp on boot.
# Useful for emulators that don't provide a wifi connection. # Useful for emulators that don't provide a wifi connection.