Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ca93efd authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

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

am: e7bda089

Change-Id: I6d2a5f7bfabe793a53b255edab1f15ba1399601f
parents 4650e91c e7bda089

core/dex_preopt.mk

+3 −3
Original line number Diff line number Diff line
@@ -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.

ifeq ($(HOST_OS),linux)

  WITH_DEXPREOPT ?= true

# For an eng build only pre-opt the boot image. This gives reasonable performance and still

# allows a simple workflow: building in frameworks/base and syncing.

# For an eng build only pre-opt the boot image and system server. This gives reasonable performance

# and still allows a simple workflow: building in frameworks/base and syncing.

  ifeq (eng,$(TARGET_BUILD_VARIANT))

    WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true

    WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true

  endif

# Add mini-debug-info to the boot classpath unless explicitly asked not to.

  ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))

core/dex_preopt_odex_install.mk

+6 −3
Original line number Diff line number Diff line
@@ -33,9 +33,12 @@ endif 
ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file))) # contains no java code

LOCAL_DEX_PREOPT :=

endif

# if WITH_DEXPREOPT_BOOT_IMG_ONLY=true and module is not in boot class path skip

ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_ONLY))

ifeq ($(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),)

# if WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true and module is not in boot class path skip

# Also preopt system server jars since selinux prevents system server from loading anything from

# /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 :=

endif

endif

core/product.mk

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ _product_stash_var_list += \ 
_product_stash_var_list += \

	DEFAULT_SYSTEM_DEV_CERTIFICATE \

	WITH_DEXPREOPT \

	WITH_DEXPREOPT_BOOT_IMG_ONLY \

	WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY \

	WITH_DEXPREOPT_APP_IMAGE



#

target/board/generic/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ USE_CAMERA_STUB := true 
ifeq ($(HOST_OS),linux)

  ifeq ($(WITH_DEXPREOPT),)

    WITH_DEXPREOPT := true

    WITH_DEXPREOPT_BOOT_IMG_ONLY := false

    WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false

  endif

endif

target/board/generic_arm64/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ USE_CAMERA_STUB := true 
ifeq ($(HOST_OS),linux)

  ifeq ($(WITH_DEXPREOPT),)

    WITH_DEXPREOPT := true

    WITH_DEXPREOPT_BOOT_IMG_ONLY := false

    WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false

  endif

endif