tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Deprecate VNDK-lite support from Legacy GSI" am: c45c04e38e am: 1e220966a7

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1382483

Change-Id: I71b572821a1f9c57c485fed9f95ddf1d45a54fd1
This commit is contained in:
Treehugger Robot 2020-08-06 19:36:03 +00:00 committed by Automerger Merge Worker
commit e904d0e193
7 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/product/gsi/Android.mk
View file

@ -211,3 +211,13 @@ LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := init LOCAL_MODULE_RELATIVE_PATH := init
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := init.vndk-nodef.rc
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_CLASS := ETC
LOCAL_SYSTEM_EXT_MODULE := true
LOCAL_MODULE_RELATIVE_PATH := init
include $(BUILD_PREBUILT)

2
target/product/gsi/init.gsi.rc
View file

@ -1,3 +1,5 @@
# #
# Android init script for GSI required initialization # Android init script for GSI required initialization
# #
import /system/system_ext/etc/init/init.vndk-${ro.vndk.version:-nodef}.rc

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

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

3
target/product/gsi/init.vndk-27.rc
View file

@ -1,3 +0,0 @@
on early-init
# Set ro.vndk.version to 27 so that O-MR1-VENDOR can run latest GSI.
setprop ro.vndk.version 27

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

@ -0,0 +1,3 @@
on early-init
# Must define BOARD_VNDK_VERSION
exec - root -- /system/bin/reboot bootloader

3
target/product/gsi_release.mk
View file

@ -54,7 +54,8 @@ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened
# GSI specific tasks on boot # GSI specific tasks on boot
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
gsi_skip_mount.cfg \ gsi_skip_mount.cfg \
init.gsi.rc init.gsi.rc \
init.vndk-nodef.rc \
# Support additional P, Q and R VNDK packages # Support additional P, Q and R VNDK packages
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30 PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 30

14
target/product/legacy_gsi_release.mk
View file

@ -16,22 +16,8 @@
include $(SRC_TARGET_DIR)/product/gsi_release.mk include $(SRC_TARGET_DIR)/product/gsi_release.mk
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/etc/init/init.legacy-gsi.rc \
system/etc/init/gsi/init.vndk-27.rc \
system/etc/ld.config.vndk_lite.txt \
# Legacy GSI support additional O-MR1 interface # Legacy GSI support additional O-MR1 interface
PRODUCT_EXTRA_VNDK_VERSIONS += 27 PRODUCT_EXTRA_VNDK_VERSIONS += 27
# Support for the O-MR1 devices
PRODUCT_COPY_FILES += \
build/make/target/product/gsi/init.legacy-gsi.rc:system/etc/init/init.legacy-gsi.rc \
build/make/target/product/gsi/init.vndk-27.rc:system/etc/init/gsi/init.vndk-27.rc
# Namespace configuration file for non-enforcing VNDK
PRODUCT_PACKAGES += \
ld.config.vndk_lite.txt
# Legacy GSI relax the compatible property checking # Legacy GSI relax the compatible property checking
PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := false PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := false