From 8014b0510ae853acae129f0d91a78e32f0605b67 Mon Sep 17 00:00:00 2001
From: Wei Li <weiwli@google.com>
Date: Thu, 3 Oct 2024 08:08:14 +0000
Subject: Convert modules below in build/make/target/product/gsi/Android.mk to
 Android.bp

- init.gsi.rc
- init.vndk-nodef.rc

Bug: 371111740
Change-Id: I34fa17f8239ec965168e1b3931af66b4efb90de0
Test: lunch aosp_arm64-trunk_staging-eng && m && ls out/target/product/generic_arm64/system/system_ext/etc/init/init.gsi.rc out/target/product/generic_arm64/system/system_ext/etc/gsi/init.vndk-nodef.rc
---
 target/product/gsi/Android.bp | 15 +++++++++++++++
 target/product/gsi/Android.mk | 28 ----------------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/target/product/gsi/Android.bp b/target/product/gsi/Android.bp
index 45ba14331b..f18f35a328 100644
--- a/target/product/gsi/Android.bp
+++ b/target/product/gsi/Android.bp
@@ -46,3 +46,18 @@ install_symlink {
     installed_location: "etc/init/config",
     symlink_target: "/system/system_ext/etc/init/config",
 }
+
+// init.gsi.rc, GSI-specific init script.
+prebuilt_etc {
+    name: "init.gsi.rc",
+    src: "init.gsi.rc",
+    system_ext_specific: true,
+    relative_install_path: "init",
+}
+
+prebuilt_etc {
+    name: "init.vndk-nodef.rc",
+    src: "init.vndk-nodef.rc",
+    system_ext_specific: true,
+    relative_install_path: "gsi",
+}
diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 36897fef8e..729105961d 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -138,31 +138,3 @@ LOCAL_REQUIRED_MODULES := \
 
 
 include $(BUILD_PHONY_PACKAGE)
-
-#####################################################################
-# init.gsi.rc, GSI-specific init script.
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := init.gsi.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 := 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)
-- 
cgit v1.2.3-59-g8ed1b