diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-05-24 16:25:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-24 16:25:48 +0000 |
| commit | 13feeb7b6236864775adb6f288646d72242557e1 (patch) | |
| tree | 6ec09e0930e3107665e3ac28badeb35a81d7cfc2 /androidmk | |
| parent | acce05a58cfbd7185cd3780a0ce82ef722696a9b (diff) | |
| parent | 0d11feb42f4b398d1872cbc0ef30eaae12c93cec (diff) | |
| download | build_soong-13feeb7b6236864775adb6f288646d72242557e1.tar.gz build_soong-13feeb7b6236864775adb6f288646d72242557e1.tar.bz2 build_soong-13feeb7b6236864775adb6f288646d72242557e1.zip | |
Merge "Convert LOCAL_COMPATIBILITY_SUPPORT_FILES to data: attribute in androidmk"
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 a23879f5..cb71725a 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 b3b1ce0c..2eab0ccf 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"], } `, }, |