diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-01-15 13:43:54 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2019-01-15 16:39:02 -0800 |
| commit | e9622a33c32829700f2553c15baeed8a8fd1bb37 (patch) | |
| tree | 9ca44fa53d81bb39beb4c67114587e586ad33c14 /androidmk | |
| parent | adf980bf916ba710b287f41b5116114cbacc052a (diff) | |
| download | build_soong-e9622a33c32829700f2553c15baeed8a8fd1bb37.tar.gz build_soong-e9622a33c32829700f2553c15baeed8a8fd1bb37.tar.bz2 build_soong-e9622a33c32829700f2553c15baeed8a8fd1bb37.zip | |
Add BUILD_CTS_* to androidmk
Bug: 122617736
Test: new unit tests
Change-Id: Ibce6b4bbe49015a1ca6cf88cd43badc6b5cc078e
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 5 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 55 |
2 files changed, 60 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index a28cf49b..71eb19b6 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -803,6 +803,11 @@ var moduleTypes = map[string]string{ "BUILD_HOST_JAVA_LIBRARY": "java_library_host", "BUILD_HOST_DALVIK_JAVA_LIBRARY": "java_library_host_dalvik", "BUILD_PACKAGE": "android_app", + + "BUILD_CTS_SUPPORT_PACKAGE": "cts_support_package", // will be rewritten to android_test by bpfix + "BUILD_CTS_PACKAGE": "cts_package", // will be rewritten to android_test by bpfix + "BUILD_CTS_TARGET_JAVA_LIBRARY": "cts_target_java_library", // will be rewritten to java_library by bpfix + "BUILD_CTS_HOST_JAVA_LIBRARY": "cts_host_java_library", // will be rewritten to java_library_host by bpfix } var prebuiltTypes = map[string]string{ diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index c750f220..9874cb2c 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -752,6 +752,61 @@ cc_library_shared { } `, }, + { + desc: "BUILD_CTS_SUPPORT_PACKAGE", + in: ` +include $(CLEAR_VARS) +LOCAL_PACKAGE_NAME := FooTest +LOCAL_COMPATIBILITY_SUITE := cts +include $(BUILD_CTS_SUPPORT_PACKAGE) +`, + expected: ` +android_test { + name: "FooTest", + defaults: ["cts_support_defaults"], + test_suites: ["cts"], +} +`, + }, + { + desc: "BUILD_CTS_PACKAGE", + in: ` +include $(CLEAR_VARS) +LOCAL_PACKAGE_NAME := FooTest +LOCAL_COMPATIBILITY_SUITE := cts +include $(BUILD_CTS_PACKAGE) +`, + expected: ` +android_test { + name: "FooTest", + defaults: ["cts_defaults"], + test_suites: ["cts"], +} +`, + }, + { + desc: "BUILD_CTS_*_JAVA_LIBRARY", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE := foolib +include $(BUILD_CTS_TARGET_JAVA_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := foolib-host +include $(BUILD_CTS_HOST_JAVA_LIBRARY) +`, + expected: ` +java_library { + name: "foolib", + defaults: ["cts_defaults"], +} + +java_library_host { + name: "foolib-host", + defaults: ["cts_defaults"], +} +`, + }, } func TestEndToEnd(t *testing.T) { |