diff options
| author | Jim Tang <jimtang@google.com> | 2024-01-04 16:34:49 +0800 |
|---|---|---|
| committer | Jim Tang <jimtang@google.com> | 2024-01-09 12:51:56 +0800 |
| commit | b9db38631ec2d46b919f61514ceed595624cb2b2 (patch) | |
| tree | d178f2b7692156ab10df615215281e99e62d9915 /androidmk | |
| parent | 0f5162161d14a07b6132c33fef8d35d937cbd514 (diff) | |
Ignore LOCAL_XTS_TEST_PACKAGE translation
This commit enables `androidmk` to skip checking the obsolete attribute
`LOCAL_XTS_TEST_PACKAGE` without generating warning message.
Bug: 318619340
Test: m androidmk && androidmk <somewhere>/Android.mk
Change-Id: I42dbbd4aa1c61b9e344bfb219b372a0c48d77645
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/androidmk/android.go | 1 | ||||
| -rw-r--r-- | androidmk/androidmk/androidmk_test.go | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/androidmk/androidmk/android.go b/androidmk/androidmk/android.go index 276b9abd1..656491181 100644 --- a/androidmk/androidmk/android.go +++ b/androidmk/androidmk/android.go @@ -86,6 +86,7 @@ var rewriteProperties = map[string](func(variableAssignmentContext) error){ "LOCAL_ANNOTATION_PROCESSOR_CLASSES": skip, // Soong gets the processor classes from the plugin "LOCAL_CTS_TEST_PACKAGE": skip, // Obsolete + "LOCAL_XTS_TEST_PACKAGE": skip, // Obsolete "LOCAL_JACK_ENABLED": skip, // Obselete "LOCAL_JACK_FLAGS": skip, // Obselete } diff --git a/androidmk/androidmk/androidmk_test.go b/androidmk/androidmk/androidmk_test.go index 0580ae5b6..08bbb3991 100644 --- a/androidmk/androidmk/androidmk_test.go +++ b/androidmk/androidmk/androidmk_test.go @@ -823,6 +823,26 @@ android_test { `, }, { + desc: "IGNORE_LOCAL_XTS_TEST_PACKAGE", + in: ` +include $(CLEAR_VARS) +LOCAL_PACKAGE_NAME := FooTest +LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_XTS_TEST_PACKAGE := foo.bar +LOCAL_COMPATIBILITY_SUPPORT_FILES := file1 +include $(BUILD_CTS_PACKAGE) +`, + expected: ` +android_test { + name: "FooTest", + defaults: ["cts_defaults"], + test_suites: ["cts"], + + data: ["file1"], +} +`, + }, + { desc: "BUILD_CTS_*_JAVA_LIBRARY", in: ` include $(CLEAR_VARS) |