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

Commit 9dda2646 authored by Roshan Pius's avatar Roshan Pius Committed by Gerrit Code Review
Browse files

Merge "base_system.mk: Support system_server jars from apexes"

parents 4a083221 d6e239fc

core/dex_preopt_config.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_list, ProductUpdatableBootLocations,      $(PRODUCT_UPDATABLE_BOOT_LOCATIONS))

  $(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, SpeedApps,                          $(PRODUCT_DEXPREOPT_SPEED_APPS))

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

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

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

  $(call add_json_str,  DefaultCompilerFilter,              $(PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER))

  $(call add_json_str,  DefaultCompilerFilter,              $(PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER))

core/product.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -228,6 +228,8 @@ _product_list_vars += PRODUCT_SYSTEM_PROPERTY_BLACKLIST 
_product_list_vars += PRODUCT_VENDOR_PROPERTY_BLACKLIST

_product_list_vars += PRODUCT_VENDOR_PROPERTY_BLACKLIST

_product_list_vars += PRODUCT_SYSTEM_SERVER_APPS

_product_list_vars += PRODUCT_SYSTEM_SERVER_APPS

_product_list_vars += PRODUCT_SYSTEM_SERVER_JARS

_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.

# All of the apps that we force preopt, this overrides WITH_DEXPREOPT.

_product_list_vars += PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK

_product_list_vars += PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK

target/product/media_system.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,11 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 
    wifi-service \

    wifi-service \

    com.android.location.provider \

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

PRODUCT_COPY_FILES += \

    system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt

    system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt