Snap for 7314842 from 0fd3f6ac2e67f94316934acc63b7ebd55fee1a5d to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release

Change-Id: Ia53e3cb6f3a72c501b67097d1c2b9c7078906d1f

1 files changed, 6 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 7f4d5be..8a10dc8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -170,8 +170,8 @@ cc_library {
     shared_libs: libbrillo_shared_libraries,
     static_libs: [
         "libmodpb64",
-        "libgtest_prod",
     ],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 
@@ -198,7 +198,7 @@ cc_library_shared {
         "libbrillo",
         "libutils",
     ],
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 }
@@ -215,7 +215,7 @@ cc_library_shared {
         "libbrillo",
         "libminijail",
     ],
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 }
@@ -230,7 +230,7 @@ cc_library {
         "libcrypto",
         "libssl",
     ],
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 
@@ -256,7 +256,7 @@ cc_library_shared {
         "libbrillo-stream",
         "libcurl",
     ],
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 
@@ -277,7 +277,7 @@ cc_library_shared {
     name: "libbrillo-policy",
     srcs: libbrillo_policy_sources,
     shared_libs: libbrillo_shared_libraries,
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 }