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

Commit 8be30c47 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev 

am: 0081d765

Change-Id: I81039c2b5d1ae202e4cbca43e98322e15ab5c3e9
parents 4a421a28 0081d765

core/dex_preopt.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ DEX_PREOPT_DEFAULT ?= true 
SYSTEM_OTHER_ODEX_FILTER ?= app/% priv-app/%



# Method returning whether the install path $(1) should be for system_other.

install-on-system-other = $(filter-out $(PRODUCT_SYSTEM_SERVER_APPS),$(basename $(notdir $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(1)))))

install-on-system-other = $(filter-out $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(basename $(notdir $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(1)))))



# The default values for pre-opting: always preopt PIC.

# Conditional to building on linux, as dex2oat currently does not work on darwin.

core/dex_preopt_odex_install.mk

+2 −2
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS) 
endif

endif



ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE)))

  # Jars of system server, and apps loaded into system server should be

ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE)))

  # Jars of system server, apps loaded into system server, and apps the product wants to be

  # compiled with the 'speed' compiler filter.

  LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed

else

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ _product_var_list := \ 
    PRODUCT_SYSTEM_PROPERTY_BLACKLIST \

    PRODUCT_SYSTEM_SERVER_APPS \

    PRODUCT_SYSTEM_SERVER_JARS \

    PRODUCT_DEXPREOPT_SPEED_APPS \

    PRODUCT_VBOOT_SIGNING_KEY \

    PRODUCT_VBOOT_SIGNING_SUBKEY \

    PRODUCT_VERITY_SIGNING_KEY \

core/product_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ all_product_configs := 
PRODUCT_BOOT_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOT_JARS))

PRODUCT_SYSTEM_SERVER_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_JARS))

PRODUCT_SYSTEM_SERVER_APPS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_APPS))

PRODUCT_DEXPREOPT_SPEED_APPS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEXPREOPT_SPEED_APPS))



# Find the device that this product maps to.

TARGET_DEVICE := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEVICE)

target/product/core.mk

+3 −0
Original line number Diff line number Diff line
@@ -68,4 +68,7 @@ PRODUCT_SYSTEM_SERVER_APPS += \ 
    KeyChain \

    Telecom \



# The set of packages we want to force 'speed' compilation on.

PRODUCT_DEXPREOPT_SPEED_APPS += \



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk)