From 6195b3578a4b4195c0d63602303907f417e7369a Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Mon, 15 Oct 2018 17:48:42 -0700 Subject: [PATCH] Separate init packaging for mainline With system-as-root, both first and second stage init belong to system, but without system-as-root, first stage belongs to vendor and second stage belongs to system. This change references two phony packages that include the right parts of init for systen and vendor. Bug: 117606184 Test: mainline builds work properly Change-Id: I997309655fef28cb1c3d4b3be989c035b5c6488d --- target/product/base_system.mk | 2 +- target/product/base_vendor.mk | 1 + target/product/mainline_system.mk | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 11f5fe442..57e981fe4 100644 --- a/target/product/base_system.mk +++ b/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 \ diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk index 1b25f2706..9bb45d158 100644 --- a/target/product/base_vendor.mk +++ b/target/product/base_vendor.mk @@ -34,6 +34,7 @@ PRODUCT_PACKAGES += \ fs_config_dirs_nonsystem \ gralloc.default \ group \ + init_vendor \ libbundlewrapper \ libclearkeycasplugin \ libdownmix \ diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index 8d0611f62..8dec2d98b 100644 --- a/target/product/mainline_system.mk +++ b/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))