diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-20 20:28:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-20 20:28:06 +0000 |
| commit | 45f2fa3f5dc515f3d4a200e4c6fa28ace49a9d52 (patch) | |
| tree | 332dfe24dd492a73116320e8b96710ecf1017d13 | |
| parent | bbb504cdb8cca9053c7258eb68864ca5fa22883b (diff) | |
| parent | ad51fdc4e51786412a0e382da79c8259dbae6f68 (diff) | |
| download | googletest-45f2fa3f5dc515f3d4a200e4c6fa28ace49a9d52.tar.gz | |
Merge "Add libgtest_prod_headers." am: edffbb3933 am: d74d7e03c4 am: 9c5d6ca461 am: ad51fdc4e5
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1676587
Change-Id: I209f7268a9fa852654e2b00e49a18d871bb8a742
| -rw-r--r-- | googletest/Android.bp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/googletest/Android.bp b/googletest/Android.bp index 26a372ea..c7b7be61 100644 --- a/googletest/Android.bp +++ b/googletest/Android.bp @@ -95,8 +95,8 @@ cc_library_host_static { defaults: ["libgtest_host_defaults"], } -cc_library { // TODO: make this a cc_library_headers module - name: "libgtest_prod", +cc_defaults { + name: "libgtest_prod_defaults", defaults: ["libgtest_defaults", "libgtest_host_defaults"], host_supported: true, native_bridge_supported: true, @@ -112,4 +112,15 @@ cc_library { // TODO: make this a cc_library_headers module min_sdk_version: "apex_inherit", } +// Deprecated; use libgtest_prod_headers instead. +cc_library { + name: "libgtest_prod", + defaults: ["libgtest_prod_defaults"], +} + +cc_library_headers { + name: "libgtest_prod_headers", + defaults: ["libgtest_prod_defaults"], +} + // Tests are in the Android.mk. Run with external/googletest/run_tests.py. |