StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Introduce a whitelist for core apps used by system server."

Browse Source
This commit is contained in:
Nicolas Geoffray
2017-04-28 11:32:50 +00:00
committed by Gerrit Code Review
parent 1a752acc89 b08ada1daa
commit 679727afeb
5 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/dex_preopt_odex_install.mk
View File

@@ -151,6 +151,13 @@ ifndef LOCAL_DEX_PREOPT_FLAGS
LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS) LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)
endif endif
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_odex): PRIVATE_DEX_PREOPT_FLAGS := $(LOCAL_DEX_PREOPT_FLAGS)
$(built_vdex): $(built_odex) $(built_vdex): $(built_odex)
$(built_art): $(built_odex) $(built_art): $(built_odex)

1
core/product.mk
View File

@@ -112,6 +112,7 @@ _product_var_list := \
PRODUCT_SUPPORTS_VERITY_FEC \ PRODUCT_SUPPORTS_VERITY_FEC \
PRODUCT_OEM_PROPERTIES \ PRODUCT_OEM_PROPERTIES \
PRODUCT_SYSTEM_PROPERTY_BLACKLIST \ PRODUCT_SYSTEM_PROPERTY_BLACKLIST \
PRODUCT_SYSTEM_SERVER_APPS \
PRODUCT_SYSTEM_SERVER_JARS \ PRODUCT_SYSTEM_SERVER_JARS \
PRODUCT_VBOOT_SIGNING_KEY \ PRODUCT_VBOOT_SIGNING_KEY \
PRODUCT_VBOOT_SIGNING_SUBKEY \ PRODUCT_VBOOT_SIGNING_SUBKEY \

7
target/product/core.mk
View File

@@ -61,4 +61,11 @@ PRODUCT_PACKAGES += \
VpnDialogs \ VpnDialogs \
MmsService 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) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk)

5
target/product/core_minimal.mk
View File

@@ -110,6 +110,11 @@ PRODUCT_SYSTEM_SERVER_JARS := \
ethernet-service \ ethernet-service \
wifi-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 # Adoptable external storage supports both ext4 and f2fs
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
e2fsck \ e2fsck \

7
target/product/core_tiny.mk
View File

@@ -105,6 +105,13 @@ PRODUCT_SYSTEM_SERVER_JARS := \
services \ services \
wifi-service 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 += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.zygote=zygote32 ro.zygote=zygote32
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \