diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:39:20 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:39:20 +0000 |
| commit | 83e4e24a0a194cfcd87a0f3da8adb4b12b589ab3 (patch) | |
| tree | 54fb90f190c69a329c719650bad4fe22bf879033 | |
| parent | dfac711073e78e25ee2b0da35af4ed3fd092c894 (diff) | |
| parent | 6d793b72ffe4cf5deb99227bd70ee74a8bc34d72 (diff) | |
| download | googletest-83e4e24a0a194cfcd87a0f3da8adb4b12b589ab3.tar.gz | |
Snap for 8730993 from 6d793b72ffe4cf5deb99227bd70ee74a8bc34d72 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010
Change-Id: I85807595a6464842854d8374e1fa2378ec526f64
| -rw-r--r-- | TEST_MAPPING | 13 | ||||
| -rw-r--r-- | googlemock/Android.bp | 3 | ||||
| -rw-r--r-- | googletest/Android.bp | 1 |
3 files changed, 3 insertions, 14 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 32e6a971..8e6577df 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -11,18 +11,5 @@ // 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 40473d43..5e90057f 100644 --- a/googlemock/Android.bp +++ b/googlemock/Android.bp @@ -47,6 +47,9 @@ 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 4abe7ea5..6be1f26f 100644 --- a/googletest/Android.bp +++ b/googletest/Android.bp @@ -100,7 +100,6 @@ 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, |