Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
Change-Id: I982c9c981982c88802e308cdea71401427ae696e
diff --git a/testcases/template/gtest_binary_test/gtest_binary_test.py b/testcases/template/gtest_binary_test/gtest_binary_test.py
index 9765a47..a8410de 100644
--- a/testcases/template/gtest_binary_test/gtest_binary_test.py
+++ b/testcases/template/gtest_binary_test/gtest_binary_test.py
@@ -274,8 +274,17 @@
# @Override
def generateAllTests(self):
- '''Runs all binary tests.'''
- if self.batch_mode:
+ '''Runs all binary tests.
+
+ If the test cases should run in batch mode, this method executes the
+ gtest commands without adding test records, and then parses the XML
+ reports to records.
+ If the test cases should run in batch mode but be skipped (e.g., HAL is
+ not implemented), this method applies the filters in base_test, skips
+ the batch test cases, and adds one record for each of them.
+ '''
+ if self.batch_mode and not self.isSkipAllTests():
+ # TODO(b/126412742): Convert filters to --gtest_filter.
for test_case in self.testcases:
logging.info('Running %s test cases in batch.',
len(test_case.full_name.split(':')))
diff --git a/tools/build/tasks/list/vts_test_lib_package_list.mk b/tools/build/tasks/list/vts_test_lib_package_list.mk
index f09fa81..5691b5d 100644
--- a/tools/build/tasks/list/vts_test_lib_package_list.mk
+++ b/tools/build/tasks/list/vts_test_lib_package_list.mk
@@ -22,6 +22,7 @@
libclang_rt.asan-arm-android \
libclang_rt.asan-aarch64-android \
libclang_rt.asan-i686-android \
+ libclang_rt.asan-x86_64-android \
libvts_func_fuzzer_utils \
libvts_proto_fuzzer \
libvts_proto_fuzzer_proto \
diff --git a/tools/vts-tradefed/res/push_groups/IfaceFuzzerTest.push b/tools/vts-tradefed/res/push_groups/IfaceFuzzerTest.push
index 5834a25..ef7d58c 100644
--- a/tools/vts-tradefed/res/push_groups/IfaceFuzzerTest.push
+++ b/tools/vts-tradefed/res/push_groups/IfaceFuzzerTest.push
@@ -24,6 +24,7 @@
DATA/lib/libclang_rt.asan-arm-android.so->/data/local/tmp/32/libclang_rt.asan-arm-android.so
DATA/lib64/libclang_rt.asan-aarch64-android.so->/data/local/tmp/64/libclang_rt.asan-aarch64-android.so
+DATA/lib64/libclang_rt.asan-x86_64-android.so->/data/local/tmp/64/libclang_rt.asan-x86_64-android.so
DATA/asan/system/lib/libvts_proto_fuzzer.so->/data/local/tmp/32/libvts_proto_fuzzer.so
DATA/asan/system/lib64/libvts_proto_fuzzer.so->/data/local/tmp/64/libvts_proto_fuzzer.so
diff --git a/utils/python/android/api.py b/utils/python/android/api.py
index f97a8cd..5832a2d 100644
--- a/utils/python/android/api.py
+++ b/utils/python/android/api.py
@@ -16,3 +16,4 @@
PLATFORM_API_LEVEL_O = 26
PLATFORM_API_LEVEL_O_MR1 = 27
PLATFORM_API_LEVEL_P = 28
+PLATFORM_API_LEVEL_Q = 29
diff --git a/utils/python/mirror/native_entity_mirror.py b/utils/python/mirror/native_entity_mirror.py
index 2d4e1e0..ded7c3f 100644
--- a/utils/python/mirror/native_entity_mirror.py
+++ b/utils/python/mirror/native_entity_mirror.py
@@ -173,7 +173,7 @@
if converted_attr is None:
raise MirrorObjectError(
"Failed to convert attribute %s", attribute_spec)
- return coverted_attr
+ return converted_attr
logging.error("Can not find attribute: %s", attribute_name)
return None