diff options
| author | Roshan Pius <rpius@google.com> | 2019-12-02 16:47:47 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-02 16:47:47 -0800 |
| commit | 41e679308dab7e9e2971ad4595254777600f90d0 (patch) | |
| tree | cd4d880019e23e6668e8ba42863df7f003836b6a | |
| parent | 0a17dc31f3a7e231b606f46a6924796acb8b5276 (diff) | |
| parent | 78560b2049da45a5fa9ebd0bc13e13e31fb5f8e2 (diff) | |
| download | build-temp_b_145570283.tar.gz | |
Merge "base_system.mk: Align formatting for updatable boot jar variable"temp_b_145570283
am: 78560b2049
Change-Id: I677772fbf43148932f1a0af457f3060727594a06
| -rw-r--r-- | core/dex_preopt_config.mk | 3 | ||||
| -rw-r--r-- | core/product.mk | 4 | ||||
| -rw-r--r-- | target/product/base_system.mk | 9 |
3 files changed, 7 insertions, 9 deletions
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index c6c6a614b1..0f994c4164 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -92,9 +92,8 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(call add_json_bool, DisableGenerateProfile, $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE))) $(call add_json_str, ProfileDir, $(PRODUCT_DEX_PREOPT_PROFILE_DIR)) $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS)) + $(call add_json_list, UpdatableBootJars, $(PRODUCT_UPDATABLE_BOOT_JARS)) $(call add_json_list, ArtApexJars, $(ART_APEX_JARS)) - $(call add_json_list, ProductUpdatableBootModules, $(PRODUCT_UPDATABLE_BOOT_MODULES)) - $(call add_json_list, ProductUpdatableBootLocations, $(PRODUCT_UPDATABLE_BOOT_LOCATIONS)) $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS)) $(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS)) $(call add_json_list, UpdatableSystemServerJars, $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS)) diff --git a/core/product.mk b/core/product.mk index f451706586..2276db24db 100644 --- a/core/product.mk +++ b/core/product.mk @@ -366,8 +366,8 @@ _product_single_value_vars += PRODUCT_BUILD_RECOVERY_IMAGE _product_single_value_vars += PRODUCT_BUILD_BOOT_IMAGE _product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE -_product_list_vars += PRODUCT_UPDATABLE_BOOT_MODULES -_product_list_vars += PRODUCT_UPDATABLE_BOOT_LOCATIONS +# List of boot jars delivered via apex +_product_list_vars += PRODUCT_UPDATABLE_BOOT_JARS # Whether the product would like to check prebuilt ELF files. _product_single_value_vars += PRODUCT_CHECK_ELF_FILES diff --git a/target/product/base_system.mk b/target/product/base_system.mk index df4f6a7fee..7978cff96b 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -325,12 +325,11 @@ PRODUCT_BOOT_JARS := \ ims-common \ ike \ updatable-media -PRODUCT_UPDATABLE_BOOT_MODULES := conscrypt ike updatable-media -PRODUCT_UPDATABLE_BOOT_LOCATIONS := \ - /apex/com.android.conscrypt/javalib/conscrypt.jar \ - /apex/com.android.ipsec/javalib/ike.jar \ - /apex/com.android.media/javalib/updatable-media.jar +PRODUCT_UPDATABLE_BOOT_JARS := \ + com.android.conscrypt:conscrypt \ + com.android.ipsec:ike \ + com.android.media:updatable-media PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \ |