diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-02-21 13:10:54 -0800 |
|---|---|---|
| committer | Sasha Smundak <asmundak@google.com> | 2019-02-22 15:10:08 -0800 |
| commit | f7ed0513e9102cc34a07d3890bccdf351865db63 (patch) | |
| tree | f98a65b184bdc1b5dda023750fc83b2e33c30b5b /androidmk | |
| parent | e608a51b06031d3765541859068a2be298d19374 (diff) | |
| download | build_soong-f7ed0513e9102cc34a07d3890bccdf351865db63.tar.gz build_soong-f7ed0513e9102cc34a07d3890bccdf351865db63.tar.bz2 build_soong-f7ed0513e9102cc34a07d3890bccdf351865db63.zip | |
Handle LOCAL_MODULE_PATH assignment for android_test modules
Many Android.mk files for the CTS tests have
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
statement. This can be dropped during the conversion to blueprint
files.
Also, ignore the assignments to obsolete LOCAL_CTS_TEST_PACKAGE
variable.
Fixes: 125405331
Test: Internal tests, selectively run androidmk on Android.mk's in cts/
directory
Change-Id: I2ed88acd3c8837f96b84be6eb7c7b9b0b5405f57
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index a5dfcd90..4af5d971 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -72,6 +72,7 @@ var rewriteProperties = map[string](func(variableAssignmentContext) error){ "LOCAL_JAR_EXCLUDE_FILES": skip, // Soong never excludes files from jars "LOCAL_ANNOTATION_PROCESSOR_CLASSES": skip, // Soong gets the processor classes from the plugin + "LOCAL_CTS_TEST_PACKAGE": skip, // Obsolete } // adds a group of properties all having the same type diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index 618dd42f..9af2beac 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -758,6 +758,7 @@ cc_library_shared { include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := FooTest LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) include $(BUILD_CTS_SUPPORT_PACKAGE) `, expected: ` @@ -765,6 +766,7 @@ android_test { name: "FooTest", defaults: ["cts_support_defaults"], test_suites: ["cts"], + } `, }, @@ -774,6 +776,7 @@ android_test { include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := FooTest LOCAL_COMPATIBILITY_SUITE := cts +LOCAL_CTS_TEST_PACKAGE := foo.bar include $(BUILD_CTS_PACKAGE) `, expected: ` @@ -781,6 +784,7 @@ android_test { name: "FooTest", defaults: ["cts_defaults"], test_suites: ["cts"], + } `, }, |