Merge "Separate init packaging for mainline" am: eea8dad05f am: aafccd7aac

am: a71d92f915

Change-Id: Iaadc507dfc6fec5c02b94192afc9b75d4e4762f3

target/product/base_system.mk

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

target/product/base_vendor.mk

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

target/product/mainline_system.mk

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