aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-11 05:04:14 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-11 05:04:14 +0000
commitab041707b5b97b246ab9d688757a51cfe3d11ff7 (patch)
tree89cc7248c705d876f6c5ae4e8f334b897765289c
parent2e4f4fa13ec694bd852bab429d26c2ada7308067 (diff)
parent31d04b416ad6fa2aa62b07b848a8e4693844c6db (diff)
downloadgoogletest-android13-mainline-scheduling-release.tar.gz
Snap for 8570526 from 31d04b416ad6fa2aa62b07b848a8e4693844c6db to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release
Change-Id: I317d34d08dcb88561bce02bb22037c99566e177c
-rw-r--r--TEST_MAPPING13
-rw-r--r--googlemock/Android.bp3
-rw-r--r--googletest/Android.bp1
3 files changed, 14 insertions, 3 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8e6577df..32e6a971 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,5 +11,18 @@
// Confirm VTS test can pass
"name": "VtsHalPowerStatsV1_0TargetTest"
}
+ ],
+ "hwasan-postsubmit": [
+ {
+ "name": "gtest_isolated_tests"
+ },
+ {
+ // Confirm GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST behavior
+ "name": "VtsHalBluetoothA2dpV1_0TargetTest"
+ },
+ {
+ // Confirm VTS test can pass
+ "name": "VtsHalPowerStatsV1_0TargetTest"
+ }
]
}
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,