openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Include root in mainline_system artifact claim. 

With PRODUCT_SHIPPING_API_LEVEL >= 28, system-as-root is implied.
Remove redundant whitelist entries.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ia18ef42525a3abb33842e939c389530ed299aafe
This commit is contained in:
Anton Hansson 2018-07-02 15:01:35 +01:00
parent 7117311323
commit 173b5e75db
1 changed files with 6 additions and 9 deletions
target/product
mainline_system.mk

15
target/product/mainline_system.mk
View File

@ -37,17 +37,14 @@ _selinux_policy_whitelist := \
_base_mk_whitelist := \
$(_selinux_policy_whitelist) \
recovery/root/etc/mke2fs.conf \
root/init \
root/init.environ.rc \
root/init.rc \
root/init.usb.configfs.rc \
root/init.usb.rc \
root/init.zygote32.rc \
root/sbin/charger \
root/ueventd.rc \
vendor/lib/mediadrm/libdrmclearkeyplugin.so \
vendor/lib64/mediadrm/libdrmclearkeyplugin.so \
_my_whitelist := $(_base_mk_whitelist)
$(call require-artifacts-in-path, $(TARGET_COPY_OUT_SYSTEM), $(_my_whitelist))
# Both /system and / are in system.img when PRODUCT_SHIPPING_API_LEVEL>=28.
_my_paths := \
$(TARGET_COPY_OUT_ROOT) \
$(TARGET_COPY_OUT_SYSTEM) \
$(call require-artifacts-in-path, $(_my_paths), $(_my_whitelist))