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

Commit 626f6371 authored by Roshan Pius's avatar Roshan Pius
Browse files

base_system.mk: Align formatting for updatable boot jar variable 

Migrate PRODUCT_UPDATABLE_BOOT_MODULES &
PRODUCT_UPDATABLE_BOOT_LOCATIONS to a new PRODUCT_UPDATABLE_BOOT_JARS.
This new variable uses the same format as
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS, i.e <apex>:<jar> pair.

Test: Compiles & flashed device. Ensured that the bootclasspath & system_server class
paths remain the same.

Change-Id: I1cb26d5ec825cd1f5282a6e0255094ddf2fe046a
parent fe283c99

core/dex_preopt_config.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -92,9 +92,8 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_bool, DisableGenerateProfile,             $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))

  $(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_str,  ProfileDir,                         $(PRODUCT_DEX_PREOPT_PROFILE_DIR))

  $(call add_json_list, BootJars,                           $(PRODUCT_BOOT_JARS))

  $(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, 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, SystemServerJars,                   $(PRODUCT_SYSTEM_SERVER_JARS))

  $(call add_json_list, SystemServerApps,                   $(PRODUCT_SYSTEM_SERVER_APPS))

  $(call add_json_list, SystemServerApps,                   $(PRODUCT_SYSTEM_SERVER_APPS))

  $(call add_json_list, UpdatableSystemServerJars,          $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS))

  $(call add_json_list, UpdatableSystemServerJars,          $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS))

core/product.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -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_BOOT_IMAGE

_product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE

_product_single_value_vars += PRODUCT_BUILD_VBMETA_IMAGE





_product_list_vars += PRODUCT_UPDATABLE_BOOT_MODULES

# List of boot jars delivered via apex

_product_list_vars += PRODUCT_UPDATABLE_BOOT_LOCATIONS

_product_list_vars += PRODUCT_UPDATABLE_BOOT_JARS





# Whether the product would like to check prebuilt ELF files.

# Whether the product would like to check prebuilt ELF files.

_product_single_value_vars += PRODUCT_CHECK_ELF_FILES

_product_single_value_vars += PRODUCT_CHECK_ELF_FILES

target/product/base_system.mk

+4 −5
Original line number Original line Diff line number Diff line
@@ -324,12 +324,11 @@ PRODUCT_BOOT_JARS := \ 
    ims-common \

    ims-common \

    ike \

    ike \

    updatable-media

    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 += \

PRODUCT_COPY_FILES += \

    system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \

    system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \