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

Commit 58554adb authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Introduce a whitelist for core apps used by system server. 

am: 7d32b8bb

Change-Id: Ia7e107be9ff3e36ce918446a0a598d7c09d56f20
parents a0315d05 7d32b8bb

core/dex_preopt_odex_install.mk

+7 −0
Original line number Diff line number Diff line
@@ -151,6 +151,13 @@ ifndef LOCAL_DEX_PREOPT_FLAGS 
LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)

endif

endif



# Jars of system server, and apps loaded into system server should be

# compiled with the 'speed' compiler filter.

ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE)))

  LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed

endif



$(built_odex): PRIVATE_DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS)

$(built_vdex): $(built_odex)

$(built_art): $(built_odex)

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ _product_var_list := \ 
    PRODUCT_SUPPORTS_VERITY_FEC \

    PRODUCT_OEM_PROPERTIES \

    PRODUCT_SYSTEM_PROPERTY_BLACKLIST \

    PRODUCT_SYSTEM_SERVER_APPS \

    PRODUCT_SYSTEM_SERVER_JARS \

    PRODUCT_VBOOT_SIGNING_KEY \

    PRODUCT_VBOOT_SIGNING_SUBKEY \

target/product/core.mk

+7 −0
Original line number Diff line number Diff line
@@ -61,4 +61,11 @@ PRODUCT_PACKAGES += \ 
    VpnDialogs \

    MmsService



# The set of packages whose code can be loaded by the system server.

PRODUCT_SYSTEM_SERVER_APPS += \

    FusedLocation \

    InputDevices \

    KeyChain \

    Telecom \



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk)

target/product/core_minimal.mk

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

    wifi-service



# The set of packages whose code can be loaded by the system server.

PRODUCT_SYSTEM_SERVER_APPS += \

    SettingsProvider \

    WallpaperBackup



# Adoptable external storage supports both ext4 and f2fs

PRODUCT_PACKAGES += \

    e2fsck \

target/product/core_tiny.mk

+7 −0
Original line number Diff line number Diff line
@@ -105,6 +105,13 @@ PRODUCT_SYSTEM_SERVER_JARS := \ 
    services \

    wifi-service



# The set of packages whose code can be loaded by the system server.

PRODUCT_SYSTEM_SERVER_APPS += \

    FusedLocation \

    InputDevices \

    SettingsProvider \

    WallpaperBackup \



PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \

    ro.zygote=zygote32

PRODUCT_COPY_FILES += \