diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-05-23 12:58:45 -0700 |
|---|---|---|
| committer | Sasha Smundak <asmundak@google.com> | 2019-05-23 13:02:06 -0700 |
| commit | 0d11feb42f4b398d1872cbc0ef30eaae12c93cec (patch) | |
| tree | 77679dea912d47c5f60aee9baf983845f9652e75 /androidmk | |
| parent | d14e5c6ed441448d174724db13fc0b41aa6cb17b (diff) | |
Convert LOCAL_COMPATIBILITY_SUPPORT_FILES to data: attribute in androidmk
Fixes: 133434805
Test: build executes internal tests
Change-Id: I688672cec640f0113dc06a19a87c097cda60d180
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index b54ad5e00..9387b5ff6 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -123,6 +123,7 @@ func init() { "LOCAL_SYSTEM_SHARED_LIBRARIES": "system_shared_libs", "LOCAL_ASFLAGS": "asflags", "LOCAL_CLANG_ASFLAGS": "clang_asflags", + "LOCAL_COMPATIBILITY_SUPPORT_FILES": "data", "LOCAL_CONLYFLAGS": "conlyflags", "LOCAL_CPPFLAGS": "cppflags", "LOCAL_REQUIRED_MODULES": "required", diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index 3ec5f2e01..86776ec32 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -809,6 +809,7 @@ include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := FooTest LOCAL_COMPATIBILITY_SUITE := cts LOCAL_CTS_TEST_PACKAGE := foo.bar +LOCAL_COMPATIBILITY_SUPPORT_FILES := file1 include $(BUILD_CTS_PACKAGE) `, expected: ` @@ -817,6 +818,7 @@ android_test { defaults: ["cts_defaults"], test_suites: ["cts"], + data: ["file1"], } `, }, |