commit 35587e8e431c60a20f5dde054eece0274a80aa78
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 21 02:15:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 21 02:15:36 2021 +0000
tree 7a456eefc2561f2dfd14538177204703a2346d89
parent 45ab8d16a8a95a237a49f3706e54b576801c85bf
parent eca3159e458f7feeed70272ae332f04fe18b091e

Merge "Use gtest_prod_headers." am: 9c7ee78b48 am: b9fbbbb775 am: eca3159e45

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1681765

Change-Id: Ibe2683dbc2dd6e151a89341cb7d916c3890c3d30

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 0559dc3..5ef4d58 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -148,9 +148,11 @@
         "libupdater_core",
         "libupdate_verifier",
 
-        "libgtest_prod",
         "libprotobuf-cpp-lite",
     ],
+    header_libs: [
+        "libgtest_prod_headers",
+    ],
 
     data: [
         "testdata/*",

updater/Android.bp

diff --git a/updater/Android.bp b/updater/Android.bp
index 840e50a..35debaa 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -36,7 +36,6 @@
         "libfec_rs",
         "libavb",
         "libverity_tree",
-        "libgtest_prod",
         "liblog",
         "liblp",
         "libselinux",
@@ -51,6 +50,9 @@
         "libcutils",
         "libutils",
     ],
+    header_libs: [
+        "libgtest_prod_headers",
+    ],
 }
 
 cc_defaults {

updater/Android.mk

diff --git a/updater/Android.mk b/updater/Android.mk
index ddd4d86..bb1c07d 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -34,7 +34,6 @@
     libfec_rs \
     libavb \
     libverity_tree \
-    libgtest_prod \
     liblog \
     liblp \
     libselinux \
@@ -96,6 +95,8 @@
     libtune2fs \
     $(tune2fs_static_libraries)
 
+LOCAL_HEADER_LIBRARIES := libgtest_prod_headers
+
 LOCAL_MODULE_CLASS := EXECUTABLES
 inc := $(call local-generated-sources-dir)/register.inc