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

Commit bfa878e9 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Add a variable to specify standalone system server jars." am: 1ecb2f95 am: 4207daaf 

Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: I78d1c4e2f39f90263d52aa06d0b1a33466f8918e
parents 0ef40dbf 4207daaf

core/dex_preopt_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_list, SystemServerJars,                        $(PRODUCT_SYSTEM_SERVER_JARS))

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

  $(call add_json_list, ApexSystemServerJars,                    $(PRODUCT_APEX_SYSTEM_SERVER_JARS))

  $(call add_json_list, StandaloneSystemServerJars,              $(PRODUCT_STANDALONE_SYSTEM_SERVER_JARS))

  $(call add_json_list, ApexStandaloneSystemServerJars,          $(PRODUCT_APEX_STANDALONE_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/product.mk

+7 −1
Original line number Diff line number Diff line
@@ -232,9 +232,15 @@ _product_single_value_vars += PRODUCT_SUPPORTS_VBOOT 
_product_single_value_vars += PRODUCT_SUPPORTS_VERITY

_product_single_value_vars += PRODUCT_SUPPORTS_VERITY_FEC

_product_list_vars += PRODUCT_SYSTEM_SERVER_APPS

# List of system_server classpath jars on the platform.

_product_list_vars += PRODUCT_SYSTEM_SERVER_JARS

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

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

_product_list_vars += PRODUCT_APEX_SYSTEM_SERVER_JARS

# List of jars on the platform that system_server loads dynamically using separate classloaders.

_product_list_vars += PRODUCT_STANDALONE_SYSTEM_SERVER_JARS

# List of jars delivered via apex that system_server loads dynamically using separate classloaders.

# Format = <apex name>:<jar name>

_product_list_vars += PRODUCT_APEX_STANDALONE_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

# If true, then system server jars defined in Android.mk are supported.

core/product_config.mk

+3 −0
Original line number Diff line number Diff line
@@ -327,6 +327,9 @@ PRODUCT_SYSTEM_SERVER_JARS := $(call qualify-platform-jars,$(PRODUCT_SYSTEM_SERV 
PRODUCT_APEX_BOOT_JARS := $(sort $(PRODUCT_APEX_BOOT_JARS))

PRODUCT_APEX_SYSTEM_SERVER_JARS := $(sort $(PRODUCT_APEX_SYSTEM_SERVER_JARS))



PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \

  $(call qualify-platform-jars,$(PRODUCT_STANDALONE_SYSTEM_SERVER_JARS))



ifndef PRODUCT_SYSTEM_NAME

  PRODUCT_SYSTEM_NAME := $(PRODUCT_NAME)

endif

target/product/default_art_config.mk

+14 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ PRODUCT_APEX_BOOT_JARS := \ 
    com.android.tethering:framework-tethering \

    com.android.wifi:framework-wifi



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

# List of system_server classpath jars delivered via apex.

# Keep the list sorted by module names and then library names.

PRODUCT_APEX_SYSTEM_SERVER_JARS := \

    com.android.appsearch:service-appsearch \

    com.android.art:service-art \
@@ -74,6 +75,18 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \ 


PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION += art/build/boot/boot-image-profile.txt



# List of jars on the platform that system_server loads dynamically using separate classloaders.

# Keep the list sorted library names.

PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \



# List of jars delivered via apex that system_server loads dynamically using separate classloaders.

# Keep the list sorted by module names and then library names.

PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \

    com.android.os.statsd:service-statsd \

    com.android.scheduling:service-scheduling \

    com.android.tethering:service-connectivity \

    com.android.wifi:service-wifi \



# Minimal configuration for running dex2oat (default argument values).

# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.

PRODUCT_USES_DEFAULT_ART_CONFIG := true