From faff60c8814e2d31519d86e92faf08761a1d1de1 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 8 Dec 2021 07:04:53 +0000 Subject: [PATCH] Remove init.vndk-nodef.rc This partially reverts "Deprecate VNDK-lite support from Legacy GSI". Paired with https://github.com/LineageOS/android_system_core/commit/0b265e35ddf42638fa807f5349a10c40e3d46446, it kicks permissive devices into bootloader. Given that GSI+permissive won't ever be a Lineage official scenario, revert this only on our side. Thanks @Kethen for the insight! Change-Id: I7c14fe5229e953f620bb225fa5c981752d0ac5f9 --- target/product/gsi/Android.mk | 13 ------------- target/product/gsi/init.gsi.rc | 2 -- target/product/gsi/init.vndk-nodef.rc | 3 --- target/product/gsi_release.mk | 1 - 4 files changed, 19 deletions(-) delete mode 100644 target/product/gsi/init.vndk-nodef.rc diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index 85e551d3f..c1f37e07f 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -247,16 +247,3 @@ LOCAL_SYSTEM_EXT_MODULE := true LOCAL_MODULE_RELATIVE_PATH := init include $(BUILD_PREBUILT) - - -include $(CLEAR_VARS) -LOCAL_MODULE := init.vndk-nodef.rc -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := build/soong/licenses/LICENSE -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := gsi - -include $(BUILD_PREBUILT) diff --git a/target/product/gsi/init.gsi.rc b/target/product/gsi/init.gsi.rc index 69c8e467b..c6faba78d 100644 --- a/target/product/gsi/init.gsi.rc +++ b/target/product/gsi/init.gsi.rc @@ -1,5 +1,3 @@ # # Android init script for GSI required initialization # - -import /system/system_ext/etc/gsi/init.vndk-${ro.vndk.version:-nodef}.rc diff --git a/target/product/gsi/init.vndk-nodef.rc b/target/product/gsi/init.vndk-nodef.rc deleted file mode 100644 index 1b141a05e..000000000 --- a/target/product/gsi/init.vndk-nodef.rc +++ /dev/null @@ -1,3 +0,0 @@ -on early-init - # Reboot if BOARD_VNDK_VERSION is not defined - exec - root -- /system/bin/reboot bootloader diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 74501cd1f..575e90b14 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -60,7 +60,6 @@ PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_with_prebuilts.flattened PRODUCT_PACKAGES += \ gsi_skip_mount.cfg \ init.gsi.rc \ - init.vndk-nodef.rc \ # Support additional VNDK snapshots PRODUCT_EXTRA_VNDK_VERSIONS := \ -- 2.25.1