Merge "Revert "Add trailing slash to mainline path claims."" am: d1874ddf86

am: f9ae891d1c

Change-Id: I20d1ee165426641d8d6076958502c2171981a590
This commit is contained in:
Anton Hansson 2018-10-15 03:40:38 -07:00 committed by android-build-merger
commit 1ae3812e53

View file

@ -64,8 +64,8 @@ _my_whitelist := $(_base_mk_whitelist)
# Both /system and / are in system.img when PRODUCT_SHIPPING_API_LEVEL>=28.
# Though we do have a new ramdisk partition for logical partitions.
_my_paths := \
$(TARGET_COPY_OUT_ROOT)/ \
$(TARGET_COPY_OUT_SYSTEM)/ \
$(TARGET_COPY_OUT_RAMDISK)/ \
$(TARGET_COPY_OUT_ROOT) \
$(TARGET_COPY_OUT_SYSTEM) \
$(TARGET_COPY_OUT_RAMDISK) \
$(call require-artifacts-in-path, $(_my_paths), $(_my_whitelist))