Remove libgtest_prod in favor of libgtest_prod_headers.

Bug: http://b/185916167
Test: treehugger
Change-Id: Ied9a0648c1be51f7c9c18900d9263c3b0071a069

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.