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

Commit 082fd2c5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move UPDATABLE_BOOT_(MODULES|JARS) to base_system.mk for further extension"

parents 3087d93c 167758a1

core/dex_preopt_config.mk

+6 −8
Original line number Diff line number Diff line 
DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config



UPDATABLE_BOOT_MODULES := conscrypt

UPDATABLE_BOOT_JARS := /apex/com.android.conscrypt/javalib/conscrypt.jar

NON_UPDATABLE_BOOT_MODULES := $(filter-out $(UPDATABLE_BOOT_MODULES), $(PRODUCT_BOOT_JARS))

NON_UPDATABLE_BOOT_JARS := $(foreach m,$(NON_UPDATABLE_BOOT_MODULES),/system/framework/$(m).jar)

ALL_BOOT_JARS := $(NON_UPDATABLE_BOOT_JARS) $(UPDATABLE_BOOT_JARS)

ALL_BOOT_MODULES := $(NON_UPDATABLE_BOOT_MODULES) $(UPDATABLE_BOOT_MODULES)

NON_UPDATABLE_BOOT_MODULES := $(filter-out $(PRODUCT_UPDATABLE_BOOT_MODULES), $(PRODUCT_BOOT_JARS))

NON_UPDATABLE_BOOT_LOCATIONS := $(foreach m,$(NON_UPDATABLE_BOOT_MODULES),/system/framework/$(m).jar)

ALL_BOOT_LOCATIONS := $(NON_UPDATABLE_BOOT_LOCATIONS) $(PRODUCT_UPDATABLE_BOOT_LOCATIONS)

ALL_BOOT_MODULES := $(NON_UPDATABLE_BOOT_MODULES) $(PRODUCT_UPDATABLE_BOOT_MODULES)



PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(ALL_BOOT_JARS))

PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(ALL_BOOT_LOCATIONS))



DEXPREOPT_BOOT_JARS_MODULES := $(NON_UPDATABLE_BOOT_MODULES)

DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS := $(NON_UPDATABLE_BOOT_JARS)

DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS := $(NON_UPDATABLE_BOOT_LOCATIONS)

DEXPREOPT_BOOTCLASSPATH_DEX_FILES := $(foreach jar,$(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS),$(PRODUCT_OUT)$(jar))



# Create paths for boot image.

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -225,6 +225,8 @@ _product_var_list := \ 
    PRODUCT_BUILD_CACHE_IMAGE \

    PRODUCT_BUILD_RAMDISK_IMAGE \

    PRODUCT_BUILD_USERDATA_IMAGE \

    PRODUCT_UPDATABLE_BOOT_MODULES \

    PRODUCT_UPDATABLE_BOOT_LOCATIONS \



define dump-product

$(info ==== $(1) ====)\

core/product_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ all_product_configs := 


# A list of module names of BOOTCLASSPATH (jar files)

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

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

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

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))

target/product/base_system.mk

+4 −0
Original line number Diff line number Diff line
@@ -286,6 +286,10 @@ PRODUCT_BOOT_JARS := \ 
    telephony-common \

    voip-common \

    ims-common

PRODUCT_UPDATABLE_BOOT_MODULES := conscrypt

PRODUCT_UPDATABLE_BOOT_LOCATIONS := \

    /apex/com.android.conscrypt/javalib/conscrypt.jar





# Add the compatibility library that is needed when org.apache.http.legacy

# is removed from the bootclasspath.