diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:16:43 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:16:43 +0000 |
| commit | 951e3f33d3c913859babec0bf3cc28ecee9e02f5 (patch) | |
| tree | 89cc7248c705d876f6c5ae4e8f334b897765289c | |
| parent | db599b393f9f4c1fdda610892ff1f6be7cac5c93 (diff) | |
| parent | 31d04b416ad6fa2aa62b07b848a8e4693844c6db (diff) | |
| download | googletest-951e3f33d3c913859babec0bf3cc28ecee9e02f5.tar.gz | |
Snap for 8564071 from 31d04b416ad6fa2aa62b07b848a8e4693844c6db to mainline-art-releaseaml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050android13-mainline-art-release
Change-Id: I7a9d138a0268610ba469ebdbbf2bd9c8348adfb3
| -rw-r--r-- | TEST_MAPPING | 13 | ||||
| -rw-r--r-- | googlemock/Android.bp | 3 | ||||
| -rw-r--r-- | googletest/Android.bp | 1 |
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, |