diff options
| author | Roshan Pius <rpius@google.com> | 2019-11-22 19:15:39 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-22 19:15:39 -0800 |
| commit | 20cc65daedcb4ccb8a8f4d5154092e93e50659e8 (patch) | |
| tree | ef8a4d831ed60a17388ce37b7f5dbf523c7ae99d | |
| parent | cde85ce1eb80af5c3a46f677b39f7ac88a78696d (diff) | |
| parent | 9dda264619d76a756b8397d5e0138d0cacdb3171 (diff) | |
| download | build-20cc65daedcb4ccb8a8f4d5154092e93e50659e8.tar.gz | |
Merge "base_system.mk: Support system_server jars from apexes"
am: 9dda264619
Change-Id: Ie5ad1cb9e89070adb95fe5ad2a69f8b0dabf899a
| -rw-r--r-- | core/dex_preopt_config.mk | 1 | ||||
| -rw-r--r-- | core/product.mk | 2 | ||||
| -rw-r--r-- | target/product/media_system.mk | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index 64ad8d9a3c..c6c6a614b1 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -97,6 +97,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(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)) $(call add_json_list, SpeedApps, $(PRODUCT_DEXPREOPT_SPEED_APPS)) $(call add_json_list, PreoptFlags, $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)) $(call add_json_str, DefaultCompilerFilter, $(PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER)) diff --git a/core/product.mk b/core/product.mk index 102e6a5c19..f451706586 100644 --- a/core/product.mk +++ b/core/product.mk @@ -228,6 +228,8 @@ _product_list_vars += PRODUCT_SYSTEM_PROPERTY_BLACKLIST _product_list_vars += PRODUCT_VENDOR_PROPERTY_BLACKLIST _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 # All of the apps that we force preopt, this overrides WITH_DEXPREOPT. _product_list_vars += PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK diff --git a/target/product/media_system.mk b/target/product/media_system.mk index 5c0902dbcf..c2c97629bc 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -56,6 +56,11 @@ PRODUCT_SYSTEM_SERVER_JARS := \ wifi-service \ com.android.location.provider \ +# system server jars which are updated via apex modules. +# The values should be of the format <apex name>:<jar name> +PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ + # Ex: com.android.wifi:wifi-service + PRODUCT_COPY_FILES += \ system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt |