p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Apply skip mounting product and other partitions in GSI" am: 00d74cc938 am: 2e39e68d07 

am: eb8b11b782

Change-Id: I13520ebc3829ffece53315aa9dc6a1f446dd4618
This commit is contained in:
SzuWei Lin 2018-12-19 03:22:14 -08:00 committed by android-build-merger
parent d74b7464bd eb8b11b782
commit ce383df8c9
14 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/aosp_arm.mk
View File

@ -40,7 +40,8 @@ PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# GSI specific tasks on boot # GSI specific tasks on boot
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc build/make/target/product/gsi/skip_mount.cfg:system/etc/init/config/skip_mount.cfg \
build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc \
# Support addtional P vendor interface # Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28 PRODUCT_EXTRA_VNDK_VERSIONS := 28

3
target/product/aosp_arm64.mk
View File

@ -56,7 +56,8 @@ PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# GSI specific tasks on boot # GSI specific tasks on boot
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc build/make/target/product/gsi/skip_mount.cfg:system/etc/init/config/skip_mount.cfg \
build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc \
# Support addtional P vendor interface # Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28 PRODUCT_EXTRA_VNDK_VERSIONS := 28

3
target/product/aosp_x86.mk
View File

@ -40,7 +40,8 @@ PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# GSI specific tasks on boot # GSI specific tasks on boot
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc build/make/target/product/gsi/skip_mount.cfg:system/etc/init/config/skip_mount.cfg \
build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc \
# Support addtional P vendor interface # Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28 PRODUCT_EXTRA_VNDK_VERSIONS := 28

3
target/product/aosp_x86_64.mk
View File

@ -56,7 +56,8 @@ PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# GSI specific tasks on boot # GSI specific tasks on boot
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc build/make/target/product/gsi/skip_mount.cfg:system/etc/init/config/skip_mount.cfg \
build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc \
# Support addtional P vendor interface # Support addtional P vendor interface
PRODUCT_EXTRA_VNDK_VERSIONS := 28 PRODUCT_EXTRA_VNDK_VERSIONS := 28

0
target/product/vndk/28.txt → target/product/gsi/28.txt
View File

0
target/product/vndk/Android.mk → target/product/gsi/Android.mk
View File

0
target/product/vndk/OWNERS → target/product/gsi/OWNERS
View File

0
target/product/vndk/current.txt → target/product/gsi/current.txt
View File

3
target/product/gsi/init.gsi.rc Normal file
View File

@ -0,0 +1,3 @@
#
# Android init script for GSI required initialization
#

0
target/product/vndk/init.legacy-gsi.rc → target/product/gsi/init.legacy-gsi.rc
View File

0
target/product/vndk/init.vndk-27.rc → target/product/gsi/init.vndk-27.rc
View File

2
target/product/gsi/skip_mount.cfg Normal file
View File

@ -0,0 +1,2 @@
/product
/product_services

7
target/product/treble_common.mk
View File

@ -48,12 +48,13 @@ PRODUCT_COPY_FILES += \
# GSI specific tasks on boot # GSI specific tasks on boot
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc build/make/target/product/gsi/skip_mount.cfg:system/etc/init/config/skip_mount.cfg \
build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc \
# Support for the O-MR1 devices # Support for the O-MR1 devices
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
build/make/target/product/vndk/init.legacy-gsi.rc:system/etc/init/init.legacy-gsi.rc \ build/make/target/product/gsi/init.legacy-gsi.rc:system/etc/init/init.legacy-gsi.rc \
build/make/target/product/vndk/init.vndk-27.rc:system/etc/init/gsi/init.vndk-27.rc build/make/target/product/gsi/init.vndk-27.rc:system/etc/init/gsi/init.vndk-27.rc
# Name space configuration file for non-enforcing VNDK # Name space configuration file for non-enforcing VNDK
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

2
target/product/vndk/init.gsi.rc
View File

@ -1,2 +0,0 @@
on early-init
umount /product # TODO(b/119391482): workaround for /system/product