diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-26 23:42:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-26 23:42:19 +0000 |
| commit | 9eddebfa46f188f06c776f7b1018f54dc545eace (patch) | |
| tree | 2d81d7babee106e2159fec1caadd495ab7941e8d | |
| parent | cf49fe9bb2daba08b286baca02c8fe5879bb39c5 (diff) | |
| parent | e8e7b214f9438ba3b734cba4b6cc7b6a8a1dbc37 (diff) | |
| download | minikin-9eddebfa46f188f06c776f7b1018f54dc545eace.tar.gz | |
Merge "Use libgtest_prod_headers." am: 20789f9b7c am: e8e7b214f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/1684058
Change-Id: I7505a62523eda1131975df9be89631c3c6642165
| -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, |