Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f75a7bb8 authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

Merge "Convert modules below in build/make/target/product/gsi/Android.mk to Android.bp" into main

parents 496d6d04 8014b051

target/product/gsi/Android.bp

+15 −0
Original line number Diff line number Diff line
@@ -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",

}

target/product/gsi/Android.mk

+0 −28
Original line number Diff line number Diff line
@@ -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)