Merge "Include root in mainline_system artifact claim."

This commit is contained in:
Anton Hansson 2018-07-02 16:20:15 +00:00 committed by Gerrit Code Review
commit a9966c7c60
1 changed files with 6 additions and 9 deletions

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))