openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

Fixed the failing targets.

Bug: 74209329
Test: make

This reverts commit 0ecba4b139.

(cherry picked from commit 1f1335ceeb)

Merged-In: I4f346b8107ffaf6afbd551d91574ed040372635e
Change-Id: I01d32749ad2cad09479e3864729ecd8ef2c63b5d
This commit is contained in:
Mathieu Chartier 2018-03-09 18:03:16 -08:00
parent d4ef79d7df
commit e430236eba
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/dex_preopt.mk
View File

@ -46,6 +46,16 @@ ifeq ($(HOST_OS),linux)
ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))
PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info
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
GLOBAL_DEXPREOPT_FLAGS :=

3
core/product.mk
View File

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