diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-20 18:06:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-20 18:06:52 +0000 |
commit | d74d7e03c462077e5eb9b12d792bcc49b444c3ab (patch) | |
tree | 332dfe24dd492a73116320e8b96710ecf1017d13 | |
parent | 0fbd56df6fa9fe42f02cbe27906105a4ec3d7eda (diff) | |
parent | edffbb3933e0b7979ee9650800a8aacd0e17341c (diff) | |
download | googletest-d74d7e03c462077e5eb9b12d792bcc49b444c3ab.tar.gz |
Merge "Add libgtest_prod_headers." am: edffbb3933
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1676587
Change-Id: I37d51c7a4b8dee95a2600924234f01912da5976d
-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. |