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

Commit 2d541f35 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Apply skip mounting product and other partitions in GSI 

Uses skip_mount.cfg for `init` to skip mounting product and
product_service paritions in GSI. The patch also removes
the un-mount in `init.gsi.rc`.

With this patch, a device with flashing GSI will not use the
content in product/prodcut_service partitions on the device
and will always use the content under /system/product in GSI.

The patch also rename the target/product/vndk to
target/product/gsi.

Bug: 120208657
Bug: 117246558
Test: Boot blueline master/P with flashing aosp_arm64-userdebug
Test: /product and /product_service should be symbolic links
Change-Id: Idc9c60e5a05b3d90fc4ab64b0ac000571849b19b
parent a4fd5e72

target/product/aosp_arm.mk

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

    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

PRODUCT_EXTRA_VNDK_VERSIONS := 28

target/product/aosp_arm64.mk

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

    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

PRODUCT_EXTRA_VNDK_VERSIONS := 28

target/product/aosp_x86.mk

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

    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

PRODUCT_EXTRA_VNDK_VERSIONS := 28

target/product/aosp_x86_64.mk

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

    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

PRODUCT_EXTRA_VNDK_VERSIONS := 28