From f36ea80ea3daca7e84cd20f86b2159b7553afca0 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Fri, 30 Jul 2021 17:26:43 +0800 Subject: [PATCH] Move init.vndk-*.rc to system_ext/etc/gsi Orgianlly, init.vndk-*.rc are placed under system_ext/etc/init. `init` always run all thse .rc files. The patch move these .rc files to system_ext/etc/gsi to avoid the problem. Bug: 185457479 Test: build gsi_arm64-userdebug; check the files under system_ext/ Change-Id: Iee67d6e2e872cf3cb1dd1014925ed0249c1e7e2d --- target/product/gsi/Android.mk | 2 +- target/product/gsi/init.gsi.rc | 2 +- target/product/gsi/init.vndk-nodef.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk index ecce01a264..c120d8e5b8 100644 --- a/target/product/gsi/Android.mk +++ b/target/product/gsi/Android.mk @@ -229,6 +229,6 @@ LOCAL_LICENSE_CONDITIONS := restricted LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := ETC LOCAL_SYSTEM_EXT_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := init +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 f482843220..69c8e467be 100644 --- a/target/product/gsi/init.gsi.rc +++ b/target/product/gsi/init.gsi.rc @@ -2,4 +2,4 @@ # Android init script for GSI required initialization # -import /system/system_ext/etc/init/init.vndk-${ro.vndk.version:-nodef}.rc +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 index efeef117be..1b141a05e7 100644 --- a/target/product/gsi/init.vndk-nodef.rc +++ b/target/product/gsi/init.vndk-nodef.rc @@ -1,3 +1,3 @@ on early-init - # Must define BOARD_VNDK_VERSION + # Reboot if BOARD_VNDK_VERSION is not defined exec - root -- /system/bin/reboot bootloader