commit 542183aff206fb36b998d80f4e8ba5138934d93e
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 27 01:03:31 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 27 01:03:31 2021 +0000
tree 8f6ec66173bb45a55a65c8449f382c2c16b3b13a
parent 112c96bc25460364163262d003637a6d056faa43
parent 0fd3f6ac2e67f94316934acc63b7ebd55fee1a5d

Snap for 7314842 from 0fd3f6ac2e67f94316934acc63b7ebd55fee1a5d to sc-release

Change-Id: Ic8ac0543c9be74866fbebccde1131ff8e9175ace

Android.bp

diff --git a/Android.bp b/Android.bp
index 7f4d5be..8a10dc8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -170,8 +170,8 @@
     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 @@
         "libbrillo",
         "libutils",
     ],
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 }
@@ -215,7 +215,7 @@
         "libbrillo",
         "libminijail",
     ],
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 }
@@ -230,7 +230,7 @@
         "libcrypto",
         "libssl",
     ],
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 
@@ -256,7 +256,7 @@
         "libbrillo-stream",
         "libcurl",
     ],
-    static_libs: ["libgtest_prod"],
+    header_libs: ["libgtest_prod_headers"],
     cflags: libbrillo_CFLAGS,
     export_include_dirs: ["."],
 
@@ -277,7 +277,7 @@
     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: ["."],
 }