openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Separate init packaging for mainline" 

am: eea8dad05f

Change-Id: I9ddf2c1357793e28e81cf06d31abaa58acf798f6
This commit is contained in:
Tom Cherry 2018-10-16 13:38:36 -07:00 committed by android-build-merger
parent 22db4db050 eea8dad05f
commit aafccd7aac
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/base_system.mk
View File

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

1
target/product/base_vendor.mk
View File

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

2
target/product/mainline_system.mk
View File

@ -62,10 +62,8 @@ _base_mk_whitelist :=
_my_whitelist := $(_base_mk_whitelist) _my_whitelist := $(_base_mk_whitelist)
# Both /system and / are in system.img when PRODUCT_SHIPPING_API_LEVEL>=28. # 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 := \ _my_paths := \
$(TARGET_COPY_OUT_ROOT) \ $(TARGET_COPY_OUT_ROOT) \
$(TARGET_COPY_OUT_SYSTEM) \ $(TARGET_COPY_OUT_SYSTEM) \
$(TARGET_COPY_OUT_RAMDISK) \
$(call require-artifacts-in-path, $(_my_paths), $(_my_whitelist)) $(call require-artifacts-in-path, $(_my_paths), $(_my_whitelist))