summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrevor Radcliffe <tradical@google.com>2022-05-06 19:03:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-05-06 19:03:31 +0000
commit2082d118fd8739ca8d5a5b490ad7785dd58036af (patch)
treea3205167754a688c4f35a7a90bcfe2acb4d8460d
parent527e284cd9c8a37b6bd0df292afd685f15d6c1dc (diff)
parentb4307cec65521f3601bd7b9849930801e5313617 (diff)
downloadgtest_extras-2082d118fd8739ca8d5a5b490ad7785dd58036af.tar.gz
Changes to gtest bp to supported isolated change am: d70c7ca434 am: 9693bd71df am: 6c075b1040 am: 12124d8d5e am: b4307cec65
Original change: https://android-review.googlesource.com/c/platform/system/testing/gtest_extras/+/2069568 Change-Id: Ic36ca86044b6f90909838fe18b8d40d633dc4cea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
1 files changed, 10 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index ef855f2..2e8def0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,8 +16,16 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
+cc_defaults {
+ name: "libgtest_isolated_defaults",
+ vendor_available: true,
+ product_available: true,
+ native_bridge_supported: true
+}
+
cc_library_static {
name: "libgtest_isolated",
+ defaults: ["libgtest_isolated_defaults"],
host_supported: true,
cflags: ["-Wall", "-Werror", "-Wextra", "-Wconversion"],
export_include_dirs: ["include"],
@@ -44,6 +52,7 @@ cc_library_static {
cc_library_static {
name: "libgtest_isolated_main",
+ defaults: ["libgtest_isolated_defaults"],
host_supported: true,
cflags: ["-Wall", "-Werror", "-Wextra"],
srcs: [
@@ -63,6 +72,7 @@ cc_library_static {
cc_test {
name: "gtest_isolated_tests",
+ defaults: ["libgtest_isolated_defaults"],
host_supported: true,
srcs: [
"tests/OptionsTest.cpp",