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

Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" into oc-mr1-dev

This commit is contained in:
Mathieu Chartier 2017-08-29 23:13:32 +00:00 committed by Android (Google) Code Review
parent d0734551b7 418258cee9
commit e7bda08941
10 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/dex_preopt.mk
View File

@ -30,10 +30,10 @@ install-on-system-other = $(filter-out $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT
# Conditional to building on linux, as dex2oat currently does not work on darwin. # Conditional to building on linux, as dex2oat currently does not work on darwin.
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT ?= true WITH_DEXPREOPT ?= true
# For an eng build only pre-opt the boot image. This gives reasonable performance and still # For an eng build only pre-opt the boot image and system server. This gives reasonable performance
# allows a simple workflow: building in frameworks/base and syncing. # and still allows a simple workflow: building in frameworks/base and syncing.
ifeq (eng,$(TARGET_BUILD_VARIANT)) ifeq (eng,$(TARGET_BUILD_VARIANT))
WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true
endif endif
# Add mini-debug-info to the boot classpath unless explicitly asked not to. # Add mini-debug-info to the boot classpath unless explicitly asked not to.
ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO)) ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))

9
core/dex_preopt_odex_install.mk
View File

@ -33,9 +33,12 @@ endif
ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file))) # contains no java code ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file))) # contains no java code
LOCAL_DEX_PREOPT := LOCAL_DEX_PREOPT :=
endif endif
# if WITH_DEXPREOPT_BOOT_IMG_ONLY=true and module is not in boot class path skip # if WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true and module is not in boot class path skip
ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_ONLY)) # Also preopt system server jars since selinux prevents system server from loading anything from
ifeq ($(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),) # /data. If we don't do this they will need to be extracted which is not favorable for RAM usage
# or performance.
ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))
ifeq ($(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),)
LOCAL_DEX_PREOPT := LOCAL_DEX_PREOPT :=
endif endif
endif endif

2
core/product.mk
View File

@ -302,7 +302,7 @@ _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_ONLY \ WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY \
WITH_DEXPREOPT_APP_IMAGE WITH_DEXPREOPT_APP_IMAGE
# #

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

@ -34,7 +34,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),) ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
endif endif
endif endif

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

@ -65,7 +65,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),) ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
endif endif
endif endif

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

@ -42,7 +42,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),) ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
endif endif
endif endif

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

@ -57,7 +57,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),) ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
endif endif
endif endif

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

@ -22,7 +22,7 @@ USE_CAMERA_STUB := true
# 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
WITH_DEXPREOPT_BOOT_IMG_ONLY ?= false WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= false
endif endif
TARGET_USES_HWC2 := true TARGET_USES_HWC2 := true

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

@ -28,7 +28,7 @@ USE_CAMERA_STUB := true
# 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
WITH_DEXPREOPT_BOOT_IMG_ONLY ?= false WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= false
endif endif
TARGET_USES_HWC2 := true TARGET_USES_HWC2 := true

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

@ -39,7 +39,7 @@ USE_CAMERA_STUB := true
ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux)
ifeq ($(WITH_DEXPREOPT),) ifeq ($(WITH_DEXPREOPT),)
WITH_DEXPREOPT := true WITH_DEXPREOPT := true
WITH_DEXPREOPT_BOOT_IMG_ONLY := false WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
endif endif
endif endif