summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-21 04:42:54 +0200
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-21 04:42:54 +0200
commitefdecddaac2eb299f96a85fe4d52d24316108c72 (patch)
treeab71eb4071245ffe7783a28b58af7ef6e52f266b
parent[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 488f7664ab -s ours am: 96b82dfdf3 -s ours am: 45ab8d16a8 -s ours (diff)
parentMerge "Use gtest_prod_headers." am: 9c7ee78b48 am: b9fbbbb775 am: eca3159e45 (diff)
downloadandroid_bootable_recovery-efdecddaac2eb299f96a85fe4d52d24316108c72.tar
android_bootable_recovery-efdecddaac2eb299f96a85fe4d52d24316108c72.tar.gz
android_bootable_recovery-efdecddaac2eb299f96a85fe4d52d24316108c72.tar.bz2
android_bootable_recovery-efdecddaac2eb299f96a85fe4d52d24316108c72.tar.lz
android_bootable_recovery-efdecddaac2eb299f96a85fe4d52d24316108c72.tar.xz
android_bootable_recovery-efdecddaac2eb299f96a85fe4d52d24316108c72.tar.zst
android_bootable_recovery-efdecddaac2eb299f96a85fe4d52d24316108c72.zip
-rw-r--r--tests/Android.bp4
-rw-r--r--updater/Android.bp4
-rw-r--r--updater/Android.mk3
3 files changed, 8 insertions, 3 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index 0559dc3b9..5ef4d58c0 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -148,9 +148,11 @@ cc_test {
"libupdater_core",
"libupdate_verifier",
- "libgtest_prod",
"libprotobuf-cpp-lite",
],
+ header_libs: [
+ "libgtest_prod_headers",
+ ],
data: [
"testdata/*",
diff --git a/updater/Android.bp b/updater/Android.bp
index 840e50ab9..35debaaf1 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -36,7 +36,6 @@ cc_defaults {
"libfec_rs",
"libavb",
"libverity_tree",
- "libgtest_prod",
"liblog",
"liblp",
"libselinux",
@@ -51,6 +50,9 @@ cc_defaults {
"libcutils",
"libutils",
],
+ header_libs: [
+ "libgtest_prod_headers",
+ ],
}
cc_defaults {
diff --git a/updater/Android.mk b/updater/Android.mk
index ddd4d864a..bb1c07d40 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -34,7 +34,6 @@ updater_common_static_libraries := \
libfec_rs \
libavb \
libverity_tree \
- libgtest_prod \
liblog \
liblp \
libselinux \
@@ -96,6 +95,8 @@ LOCAL_STATIC_LIBRARIES := \
libtune2fs \
$(tune2fs_static_libraries)
+LOCAL_HEADER_LIBRARIES := libgtest_prod_headers
+
LOCAL_MODULE_CLASS := EXECUTABLES
inc := $(call local-generated-sources-dir)/register.inc