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

Unmount product partition in GSI 

This is a workaround solution. It let GSI to unmount product
partition when booting. The patch avoid the problem that

- share UID between between system and product partition
- the product partition override the content under /system/product

Bug: 119391482
Test: Boot aosp_arm64-userdebug on a blueline device with Android P
Change-Id: I48808fcc1ca527a23eb1446b97176b08268b500e
This commit is contained in:
SzuWei Lin 2018-11-12 18:58:22 +08:00 committed by Bowgo Tsai
parent 08d4227898
commit 4999dc047c
7 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/aosp_arm.mk
View File

@ -38,6 +38,10 @@ PRODUCT_PACKAGES += \
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# GSI specific tasks on boot
PRODUCT_COPY_FILES += \
build/make/target/product/vndk/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

4
target/product/aosp_arm64.mk
View File

@ -54,6 +54,10 @@ PRODUCT_PACKAGES += \
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# GSI specific tasks on boot
PRODUCT_COPY_FILES += \
build/make/target/product/vndk/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

4
target/product/aosp_x86.mk
View File

@ -38,6 +38,10 @@ PRODUCT_PACKAGES += \
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# GSI specific tasks on boot
PRODUCT_COPY_FILES += \
build/make/target/product/vndk/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

4
target/product/aosp_x86_64.mk
View File

@ -54,6 +54,10 @@ PRODUCT_PACKAGES += \
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI # Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# GSI specific tasks on boot
PRODUCT_COPY_FILES += \
build/make/target/product/vndk/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

6
target/product/treble_common.mk
View File

@ -46,9 +46,13 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf
# GSI specific tasks on boot
PRODUCT_COPY_FILES += \
build/make/target/product/vndk/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.gsi.rc:system/etc/init/init.gsi.rc \ build/make/target/product/vndk/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/vndk/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

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

@ -1,2 +1,2 @@
# If ro.vndk.version is not defined, import init.vndk-27.rc. on early-init
import /system/etc/init/gsi/init.vndk-${ro.vndk.version:-27}.rc umount /product # TODO(b/119391482): workaround for /system/product

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

@ -0,0 +1,3 @@
# If ro.vndk.version is not defined, import init.vndk-27.rc.
import /system/etc/init/gsi/init.vndk-${ro.vndk.version:-27}.rc