aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-17 03:23:17 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-02-17 03:23:17 +0000
commit4b545bfe3f3b95617c10a7e9bcf78c15a5ac0a84 (patch)
tree3dbbc414ec2f356cca67b563d46965f405684664
parentb377bba8a505d07dfbf0b88dda46387d5417060c (diff)
parent36fc06586928e6e6fb50c29623cbb0339aca5945 (diff)
downloadgoogletest-4b545bfe3f3b95617c10a7e9bcf78c15a5ac0a84.tar.gz
Snap for 8191477 from 36fc06586928e6e6fb50c29623cbb0339aca5945 to tm-frc-networking-release
Change-Id: Iaaa0c8a07b6c6a4016adf3c2cd3696ea70b19203
-rw-r--r--googlemock/Android.bp3
-rw-r--r--googletest/Android.bp1
2 files changed, 1 insertions, 3 deletions
diff --git a/googlemock/Android.bp b/googlemock/Android.bp
index 5e90057f..40473d43 100644
--- a/googlemock/Android.bp
+++ b/googlemock/Android.bp
@@ -47,9 +47,6 @@ cc_defaults {
cc_defaults {
name: "gmock_defaults",
host_supported: true,
- sanitize: {
- never: true,
- },
target: {
linux_bionic: {
enabled: true,
diff --git a/googletest/Android.bp b/googletest/Android.bp
index 6be1f26f..4abe7ea5 100644
--- a/googletest/Android.bp
+++ b/googletest/Android.bp
@@ -100,6 +100,7 @@ cc_library_headers {
defaults: ["libgtest_defaults", "libgtest_host_defaults"],
host_supported: true,
native_bridge_supported: true,
+ ramdisk_available: true,
recovery_available: true,
vendor_ramdisk_available: true,
vendor_available: true,