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

Convert LOCAL_COMPATIBILITY_SUPPORT_FILES to data: attribute in androidmk

Browse Source 
Fixes: 133434805
Test: build executes internal tests
Change-Id: I688672cec640f0113dc06a19a87c097cda60d180
This commit is contained in:
Sasha Smundak
2019-05-23 12:58:45 -07:00
parent d14e5c6ed4
commit 0d11feb42f
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
androidmk/cmd/androidmk/android.go
View File

@@ -123,6 +123,7 @@ func init() {
"LOCAL_SYSTEM_SHARED_LIBRARIES": "system_shared_libs", "LOCAL_SYSTEM_SHARED_LIBRARIES": "system_shared_libs",
"LOCAL_ASFLAGS": "asflags", "LOCAL_ASFLAGS": "asflags",
"LOCAL_CLANG_ASFLAGS": "clang_asflags", "LOCAL_CLANG_ASFLAGS": "clang_asflags",
"LOCAL_COMPATIBILITY_SUPPORT_FILES": "data",
"LOCAL_CONLYFLAGS": "conlyflags", "LOCAL_CONLYFLAGS": "conlyflags",
"LOCAL_CPPFLAGS": "cppflags", "LOCAL_CPPFLAGS": "cppflags",
"LOCAL_REQUIRED_MODULES": "required", "LOCAL_REQUIRED_MODULES": "required",

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

@@ -809,6 +809,7 @@ include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := FooTest LOCAL_PACKAGE_NAME := FooTest
LOCAL_COMPATIBILITY_SUITE := cts LOCAL_COMPATIBILITY_SUITE := cts
LOCAL_CTS_TEST_PACKAGE := foo.bar LOCAL_CTS_TEST_PACKAGE := foo.bar
LOCAL_COMPATIBILITY_SUPPORT_FILES := file1
include $(BUILD_CTS_PACKAGE) include $(BUILD_CTS_PACKAGE)
`, `,
expected: ` expected: `
@@ -817,6 +818,7 @@ android_test {
defaults: ["cts_defaults"], defaults: ["cts_defaults"],
test_suites: ["cts"], test_suites: ["cts"],
data: ["file1"],
} }
`, `,
}, },