StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Soong: Add mk2bp conversion for prebuilt_firmare.

Browse Source 
There are a couple of makefiles that have etc with $(TARGET_OUT)/etc/firmware,
$(TARGET_OUT_VENDOR)/firmare as the local module path. Added the conversion in
androidmk for target.

Bug: b/133711895
Test: Unit test cases.
Change-Id: I74aca18a7eb8aa4dd692cde680fa4e112edcf6d1
This commit is contained in:
Patrice Arruda
2019-06-03 16:47:56 -07:00
parent 06b2c69cfe
commit 1ef3bb5d51
2 changed files with 85 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
androidmk/cmd/androidmk/androidmk_test.go
View File

@@ -1176,6 +1176,84 @@ prebuilt_usr_share_host {
src: "foo.txt",
sub_dir: "bar",
}
`,
},
{
desc: "prebuilt_firmware subdir_bar in $(TARGET_OUT_ETC)",
in: `
include $(CLEAR_VARS)
LOCAL_MODULE := foo
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware/bar
LOCAL_SRC_FILES := foo.fw
include $(BUILD_PREBUILT)
`,
expected: `
prebuilt_firmware {
name: "foo",
src: "foo.fw",
sub_dir: "bar",
}
`,
},
{
desc: "prebuilt_firmware subdir_bar in $(TARGET_OUT)",
in: `
include $(CLEAR_VARS)
LOCAL_MODULE := foo
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/firmware/bar
LOCAL_SRC_FILES := foo.fw
include $(BUILD_PREBUILT)
`,
expected: `
prebuilt_firmware {
name: "foo",
src: "foo.fw",
sub_dir: "bar",
}
`,
},
{
desc: "prebuilt_firmware subdir_bar in $(TARGET_OUT_VENDOR)",
in: `
include $(CLEAR_VARS)
LOCAL_MODULE := foo
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/firmware/bar
LOCAL_SRC_FILES := foo.fw
include $(BUILD_PREBUILT)
`,
expected: `
prebuilt_firmware {
name: "foo",
src: "foo.fw",
sub_dir: "bar",
proprietary: true,
}
`,
},
{
desc: "prebuilt_firmware subdir_bar in $(TARGET_OUT)/vendor",
in: `
include $(CLEAR_VARS)
LOCAL_MODULE := foo
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/firmware/bar
LOCAL_SRC_FILES := foo.fw
include $(BUILD_PREBUILT)
`,
expected: `
prebuilt_firmware {
name: "foo",
src: "foo.fw",
sub_dir: "bar",
proprietary: true,
}
`,
},
{