tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use gtest_prod_headers." am: 9c7ee78b48

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

Change-Id: Ia0d8223a0a08fd5a2e7c0a8c5a332f104dd9d803
This commit is contained in:
Treehugger Robot 2021-04-21 01:13:54 +00:00 committed by Automerger Merge Worker
commit b9fbbbb775
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/Android.bp
View file

@ -148,9 +148,11 @@ cc_test {
"libupdater_core", "libupdater_core",
"libupdate_verifier", "libupdate_verifier",
"libgtest_prod",
"libprotobuf-cpp-lite", "libprotobuf-cpp-lite",
], ],
header_libs: [
"libgtest_prod_headers",
],
data: [ data: [
"testdata/*", "testdata/*",

4
updater/Android.bp
View file

@ -36,7 +36,6 @@ cc_defaults {
"libfec_rs", "libfec_rs",
"libavb", "libavb",
"libverity_tree", "libverity_tree",
"libgtest_prod",
"liblog", "liblog",
"liblp", "liblp",
"libselinux", "libselinux",
@ -51,6 +50,9 @@ cc_defaults {
"libcutils", "libcutils",
"libutils", "libutils",
], ],
header_libs: [
"libgtest_prod_headers",
],
} }
cc_defaults { cc_defaults {

3
updater/Android.mk
View file

@ -34,7 +34,6 @@ updater_common_static_libraries := \
libfec_rs \ libfec_rs \
libavb \ libavb \
libverity_tree \ libverity_tree \
libgtest_prod \
liblog \ liblog \
liblp \ liblp \
libselinux \ libselinux \
@ -96,6 +95,8 @@ LOCAL_STATIC_LIBRARIES := \
libtune2fs \ libtune2fs \
$(tune2fs_static_libraries) $(tune2fs_static_libraries)
LOCAL_HEADER_LIBRARIES := libgtest_prod_headers
LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_CLASS := EXECUTABLES
inc := $(call local-generated-sources-dir)/register.inc inc := $(call local-generated-sources-dir)/register.inc