p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "base_system.mk: Align formatting for updatable boot jar variable" am: 78560b2049 

am: 41e679308d

Change-Id: I58fd0ced83422d4767f24e4c44f0f0b8107509ed
This commit is contained in:
Roshan Pius 2019-12-02 16:50:04 -08:00 committed by android-build-merger
parent 036ae61e93 41e679308d
commit e2b081d273
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/dex_preopt_config.mk
View File

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

4
core/product.mk
View File

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

9
target/product/base_system.mk
View File

@ -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 \