From 02a83245ef714dd65a85d6bbd16aa299e46e277c Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 20 Apr 2021 15:22:02 -0700 Subject: [PATCH] Use libgtest_prod_headers. Bug: http://b/185916167 Test: treehugger Change-Id: I9ece5926944b8c881e3a117cda2c99281c59b61e --- bootstat/Android.bp | 2 +- fastboot/Android.bp | 2 +- libstats/push_compat/Android.bp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstat/Android.bp b/bootstat/Android.bp index 545a06f20..ca59ef39b 100644 --- a/bootstat/Android.bp +++ b/bootstat/Android.bp @@ -35,7 +35,7 @@ cc_defaults { "libcutils", "liblog", ], - static_libs: ["libgtest_prod"], + header_libs: ["libgtest_prod_headers"], } // bootstat static library diff --git a/fastboot/Android.bp b/fastboot/Android.bp index ce702a08d..2c70778ae 100644 --- a/fastboot/Android.bp +++ b/fastboot/Android.bp @@ -184,7 +184,6 @@ cc_binary { static_libs: [ "libc++fs", - "libgtest_prod", "libhealthhalutils", "libsnapshot_cow", "libsnapshot_nobinder", @@ -193,6 +192,7 @@ cc_binary { header_libs: [ "avb_headers", + "libgtest_prod_headers", "libsnapshot_headers", "libstorage_literals_headers", ], diff --git a/libstats/push_compat/Android.bp b/libstats/push_compat/Android.bp index 4b2f40edc..819066eb4 100644 --- a/libstats/push_compat/Android.bp +++ b/libstats/push_compat/Android.bp @@ -55,7 +55,7 @@ cc_library { export_header_lib_headers: [ "libstatssocket_headers", ], - static_libs: ["libgtest_prod"], + header_libs: ["libgtest_prod_headers"], apex_available: ["com.android.resolv"], min_sdk_version: "29", }