Merge "Unmount product partition in GSI" am: e67518fe6d
am: fc7f09e5bf
Change-Id: I176b2e2324419017647c87a9e1a31a7136297f0d
This commit is contained in:
commit
0556ad2ab2
7 changed files with 26 additions and 3 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
# If ro.vndk.version is not defined, import init.vndk-27.rc.
|
||||
import /system/etc/init/gsi/init.vndk-${ro.vndk.version:-27}.rc
|
||||
on early-init
|
||||
umount /product # TODO(b/119391482): workaround for /system/product
|
||||
|
|
3
target/product/vndk/init.legacy-gsi.rc
Normal file
3
target/product/vndk/init.legacy-gsi.rc
Normal 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
|
||||
|
Loading…
Reference in a new issue