Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6195b357 authored by Tom Cherry's avatar Tom Cherry
Browse files

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
parent 4e90c3f9

target/product/base_system.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ PRODUCT_PACKAGES += \ 
    fs_config_dirs_nonsystem \

    gralloc.default \

    group \

    init_vendor \

    libbundlewrapper \

    libclearkeycasplugin \

    libdownmix \

target/product/mainline_system.mk

+0 −2
Original line number Diff line number Diff line
@@ -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))