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

Commit 4999dc04 authored by SzuWei Lin's avatar SzuWei Lin Committed by Bowgo Tsai
Browse files

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
parent 08d42278

target/product/aosp_arm.mk

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ PRODUCT_PACKAGES += \ 
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

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

PRODUCT_EXTRA_VNDK_VERSIONS := 28

target/product/aosp_arm64.mk

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ PRODUCT_PACKAGES += \ 
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

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

PRODUCT_EXTRA_VNDK_VERSIONS := 28

target/product/aosp_x86.mk

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ PRODUCT_PACKAGES += \ 
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

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

PRODUCT_EXTRA_VNDK_VERSIONS := 28

target/product/aosp_x86_64.mk

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ PRODUCT_PACKAGES += \ 
# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

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

PRODUCT_EXTRA_VNDK_VERSIONS := 28

target/product/treble_common.mk

+5 −1
Original line number Diff line number Diff line
@@ -46,9 +46,13 @@ PRODUCT_COPY_FILES += \ 
PRODUCT_COPY_FILES += \

    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

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



# Name space configuration file for non-enforcing VNDK