Merge "Separate init packaging for mainline" am: eea8dad05f

am: aafccd7aac

Change-Id: Iec63980e02bd41ff998689eec6725b19d68bb1de
This commit is contained in:
Tom Cherry 2018-10-16 13:45:51 -07:00 committed by android-build-merger
commit a71d92f915
3 changed files with 2 additions and 3 deletions

View File

@ -85,9 +85,9 @@ PRODUCT_PACKAGES += \
incidentd \
incident_helper \
incident_report \
init \
init.environ.rc \
init.rc \
init_system \
input \
installd \
iorapd \

View File

@ -34,6 +34,7 @@ PRODUCT_PACKAGES += \
fs_config_dirs_nonsystem \
gralloc.default \
group \
init_vendor \
libbundlewrapper \
libclearkeycasplugin \
libdownmix \

View File

@ -62,10 +62,8 @@ _base_mk_whitelist :=
_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) \
$(call require-artifacts-in-path, $(_my_paths), $(_my_whitelist))