diff options
| author | 2024-10-03 19:52:07 +0000 | |
|---|---|---|
| committer | 2024-10-03 19:52:07 +0000 | |
| commit | f75a7bb820be27f35c042218200c7dc7d76fc3a3 (patch) | |
| tree | 842ee55f4c33d3d41fa5d044b5810fd4de2231cc | |
| parent | 496d6d04267408c8100a19b81babc440b2b9348e (diff) | |
| parent | 8014b0510ae853acae129f0d91a78e32f0605b67 (diff) | |
Merge "Convert modules below in build/make/target/product/gsi/Android.mk to Android.bp" into main
| -rw-r--r-- | target/product/gsi/Android.bp | 15 | ||||
| -rw-r--r-- | 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) |