diff options
| author | Elliott Hughes <enh@google.com> | 2021-05-05 01:09:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-05 01:09:27 +0000 |
| commit | ba5ffe85ffa749c1b7ef1f83ea8539b2567226b6 (patch) | |
| tree | 9bed7727914fdf75f04a9452e850ffcb2985dd91 | |
| parent | 7d24d62891f6e667de7894b52ad0b62521418376 (diff) | |
| parent | 8265b03dbb2bf5af212ed26bf7c722fad6da4c42 (diff) | |
| download | googletest-ba5ffe85ffa749c1b7ef1f83ea8539b2567226b6.tar.gz | |
Remove libgtest_prod in favor of libgtest_prod_headers. am: 8efe8d565b am: 9675f8babc am: de65be7b11 am: 8265b03dbb
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1693985
Change-Id: Ib34e8c0ccb7f9d55736fbd606a2b41e85f4544e4
| -rw-r--r-- | googletest/Android.bp | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/googletest/Android.bp b/googletest/Android.bp index 716572ed..6be1f26f 100644 --- a/googletest/Android.bp +++ b/googletest/Android.bp @@ -95,8 +95,8 @@ cc_library_host_static { defaults: ["libgtest_host_defaults"], } -cc_defaults { - name: "libgtest_prod_defaults", +cc_library_headers { + name: "libgtest_prod_headers", defaults: ["libgtest_defaults", "libgtest_host_defaults"], host_supported: true, native_bridge_supported: true, @@ -112,31 +112,4 @@ cc_defaults { min_sdk_version: "apex_inherit", } -// Deprecated; use libgtest_prod_headers instead. -cc_library { - name: "libgtest_prod", - defaults: ["libgtest_prod_defaults"], - visibility: [ - // DO NOT ADD NEW PROJECTS. Use libgtest_prod_headers instead. - // TODO(b/185916167): When usage of libgtest_prod is cleaned up in a - // project, remove from this list. - "//external/libbrillo", - "//external/libchrome", - "//frameworks/minikin/libs/minikin", - "//hardware/interfaces/rebootescrow/aidl/default", - "//packages/modules/DnsResolver", - "//packages/modules/StatsD:__subpackages__", - "//packages/services/Car:__subpackages__", - "//system/tools/aidl", - "//system/update_engine", - "//test/sts:__subpackages__", - "//tools/security/fuzzing/system_fuzzers:__subpackages__", - ] -} - -cc_library_headers { - name: "libgtest_prod_headers", - defaults: ["libgtest_prod_defaults"], -} - // Tests are in the Android.mk. Run with external/googletest/run_tests.py. |