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

Commit 7a21f073 authored by satayev's avatar satayev
Browse files

Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS. 

Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
parent 522c8b10

core/dex_preopt_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_list, ArtApexJars,                             $(filter $(PRODUCT_BOOT_JARS),$(ART_APEX_JARS)))

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

  $(call add_json_list, UpdatableSystemServerJars,               $(PRODUCT_APEX_SYSTEM_SERVER_JARS))

  $(call add_json_bool, BrokenSuboptimalOrderOfSystemServerJars, $(PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS))

  $(call add_json_list, SpeedApps,                               $(PRODUCT_DEXPREOPT_SPEED_APPS))

  $(call add_json_list, PreoptFlags,                             $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))

core/dex_preopt_odex_install.mk

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file)$(LOCAL_SOONG_DEX_JAR))) 
endif



# Don't preopt system server jars that are updatable.

ifneq (,$(filter %:$(LOCAL_MODULE), $(PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS)))

ifneq (,$(filter %:$(LOCAL_MODULE), $(PRODUCT_APEX_SYSTEM_SERVER_JARS)))

  LOCAL_DEX_PREOPT :=

endif

core/product.mk

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ _product_single_value_vars += PRODUCT_SUPPORTS_VERITY_FEC 
_product_list_vars += PRODUCT_SYSTEM_SERVER_APPS

_product_list_vars += PRODUCT_SYSTEM_SERVER_JARS

# List of system_server jars delivered via apex. Format = <apex name>:<jar name>.

_product_list_vars += PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS

_product_list_vars += PRODUCT_APEX_SYSTEM_SERVER_JARS

# If true, then suboptimal order of system server jars does not cause an error.

_product_single_value_vars += PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS

target/product/default_art_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ PRODUCT_APEX_BOOT_JARS := \ 
    com.android.wifi:framework-wifi



# APEX system server jars. Keep the list sorted by module names and then library names.

PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \

PRODUCT_APEX_SYSTEM_SERVER_JARS := \

    com.android.appsearch:service-appsearch \

    com.android.media:service-media-s \

    com.android.permission:service-permission \