diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-26 23:00:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-26 23:00:26 +0000 |
| commit | 20789f9b7c7852e128422170c3a33295529bbf74 (patch) | |
| tree | 2d81d7babee106e2159fec1caadd495ab7941e8d | |
| parent | 89eaf28af3f61630e812145dea09f6da3ef42128 (diff) | |
| parent | a3dddd7ba570be8ffd9f3c78725d91d9d5f97c21 (diff) | |
| download | minikin-20789f9b7c7852e128422170c3a33295529bbf74.tar.gz | |
Merge "Use libgtest_prod_headers."android-s-beta-2android-s-beta-1
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | libs/minikin/Android.bp | 1 |
2 files changed, 6 insertions, 1 deletions
@@ -6,6 +6,12 @@ cc_library_headers { name: "libminikin_headers", host_supported: true, export_include_dirs: ["include"], + header_libs: [ + "libgtest_prod_headers", + ], + export_header_lib_headers: [ + "libgtest_prod_headers", + ], target: { windows: { enabled: true, diff --git a/libs/minikin/Android.bp b/libs/minikin/Android.bp index f253dba..931c8d0 100644 --- a/libs/minikin/Android.bp +++ b/libs/minikin/Android.bp @@ -85,7 +85,6 @@ cc_library { "libutils_headers", ], export_header_lib_headers: ["libminikin_headers"], - whole_static_libs: ["libgtest_prod"], clang: true, |