diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-05-09 13:45:03 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-05-15 00:33:11 +0000 |
| commit | f923f2b54cd0ad9f7fecb06f7005030886cb64a5 (patch) | |
| tree | 991b3e4c919868029d51b037ab279dd62bd7a6dc /androidmk | |
| parent | 5473c9a60a9059667130edb6036b70d24604e276 (diff) | |
| download | build_soong-f923f2b54cd0ad9f7fecb06f7005030886cb64a5.tar.gz build_soong-f923f2b54cd0ad9f7fecb06f7005030886cb64a5.tar.bz2 build_soong-f923f2b54cd0ad9f7fecb06f7005030886cb64a5.zip | |
Remove the unused `tags` property
And fix up androidmk / bpfix to provide warnings about what to do
instead.
Test: m blueprint_tools (runs the tests, ensures there aren't any tags left)
Change-Id: I1a3ad8600211050420041740207d6957f44463c8
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index 37e2427c..a54a4d2f 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -331,7 +331,7 @@ cc_library_shared { `, }, { - desc: "Keep LOCAL_MODULE_TAGS non-optional", + desc: "Warn for LOCAL_MODULE_TAGS non-optional", in: ` include $(CLEAR_VARS) LOCAL_MODULE_TAGS := debug @@ -340,7 +340,41 @@ include $(BUILD_SHARED_LIBRARY) expected: ` cc_library_shared { - tags: ["debug"], + // WARNING: Module tags are not supported in Soong. + // Add this module to PRODUCT_PACKAGES_DEBUG in your product file if you want to + // force installation for -userdebug and -eng builds. +} +`, + }, + { + desc: "Custom warning for LOCAL_MODULE_TAGS tests", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE_TAGS := debug tests +include $(BUILD_SHARED_LIBRARY) +`, + + expected: ` +cc_library_shared { + // WARNING: Module tags are not supported in Soong. + // Add this module to PRODUCT_PACKAGES_DEBUG in your product file if you want to + // force installation for -userdebug and -eng builds. + // WARNING: Module tags are not supported in Soong. + // To make a shared library only for tests, use the "cc_test_library" module + // type. If you don't use gtest, set "gtest: false". +} +`, + }, + { + desc: "Ignore LOCAL_MODULE_TAGS tests for cc_test", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE_TAGS := tests +include $(BUILD_NATIVE_TEST) +`, + + expected: ` +cc_test { } `, }, |