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

Revert "For user and userdebug generate error if DEXPREOPT is not enabled"

Browse Source 
This reverts commit f26b8e4249.

Reason for revert: Too many broken targets
Bug: 74209329
Test: m

(cherry picked from commit 0ecba4b139)

Merged-In: I8f1390eacf685e1b7144b712fe5afb8da384ceb0
Change-Id: If3540c3a4bfd2fa829e3c948c699a5fd62994998
This commit is contained in:
Mathieu Chartier
2018-03-08 18:25:28 +00:00
parent b16a5b8d17
commit d4ef79d7df
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/dex_preopt.mk
View File

@@ -46,16 +46,6 @@ ifeq ($(HOST_OS),linux)
ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO)) ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))
PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info
endif endif
# Non eng linux builds must have preopt enabled so that system server doesn't run as interpreter
# only. b/74209329
ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
ifneq (true,$(WITH_DEXPREOPT))
ifneq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))
$(call pretty-error, DEXPREOPT must be enabled for user and userdebug builds)
endif
endif
endif
endif endif
GLOBAL_DEXPREOPT_FLAGS := GLOBAL_DEXPREOPT_FLAGS :=

3
core/product.mk
View File

@@ -317,7 +317,8 @@ _product_stash_var_list += \
_product_stash_var_list += \ _product_stash_var_list += \
DEFAULT_SYSTEM_DEV_CERTIFICATE \ DEFAULT_SYSTEM_DEV_CERTIFICATE \
WITH_DEXPREOPT \ WITH_DEXPREOPT \
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY \
WITH_DEXPREOPT_APP_IMAGE
# #
# Mark the variables in _product_stash_var_list as readonly # Mark the variables in _product_stash_var_list as readonly