commit 6195b3578a4b4195c0d63602303907f417e7369a
author Tom Cherry <tomcherry@google.com> Mon Oct 15 17:48:42 2018 -0700
committer Tom Cherry <tomcherry@google.com> Tue Oct 16 09:58:54 2018 -0700
tree fbc86b7c756601fef7dd868b60a7f13d7c2810ed
parent 4e90c3f9a5243160ee893f3b2aa211a5e995cef9

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

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 11f5fe4..57e981f 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -85,9 +85,9 @@
     incidentd \
     incident_helper \
     incident_report \
-    init \
     init.environ.rc \
     init.rc \
+    init_system \
     input \
     installd \
     iorapd \