Snap for 7474514 from 2737c3ecf20644335fe7b29391a743e705d21f42 to mainline-media-swcodec-release

Change-Id: I4b32baf68bb3f231b0a389975dd9b47534fb7345

19 files changed, 72 insertions, 270 deletions

diff --git a/Android.bp b/Android.bp
index dd7852f..e8fb2cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 python_library_host {
     name: "vts_vndk_utils",
     pkg_path: "vts/testcases/vndk",
@@ -64,6 +68,9 @@ python_test_host {
         "vts",
     ],
     test_config: "abi/vts_vndk_abi_test.xml",
+    test_options: {
+        unit_test: false,
+    },
 }
 
 python_test_host {
@@ -77,6 +84,9 @@ python_test_host {
         "vts",
     ],
     test_config: "dependency/vts_vndk_dependency_test.xml",
+    test_options: {
+        unit_test: false,
+    },
 }
 
 python_test_host {
@@ -90,4 +100,7 @@ python_test_host {
         "vts",
     ],
     test_config: "files/vts_vndk_files_test.xml",
+    test_options: {
+        unit_test: false,
+    },
 }
diff --git a/abi/Android.bp b/abi/Android.bp
deleted file mode 100644
index 9479d3e..0000000
--- a/abi/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-vts_config {
-    name: "VtsVndkAbi",
-}
diff --git a/abi/AndroidTest.xml b/abi/AndroidTest.xml
deleted file mode 100644
index cf220a6..0000000
--- a/abi/AndroidTest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS VNDK ABI test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-vndk" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="HostDrivenTest.push" />
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsVndkAbi" />
-        <option name="test-case-path" value="vts/testcases/vndk/abi/VtsVndkAbiTest" />
-    </test>
-</configuration>
-
diff --git a/abi/OWNERS b/abi/OWNERS
new file mode 100644
index 0000000..c8244dd
--- /dev/null
+++ b/abi/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 170896
+hsinyichen@google.com
diff --git a/dependency/Android.bp b/dependency/Android.bp
deleted file mode 100644
index d9715a1..0000000
--- a/dependency/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-vts_config {
-    name: "VtsVndkDependency",
-}
diff --git a/dependency/AndroidTest.xml b/dependency/AndroidTest.xml
deleted file mode 100644
index 70c3138..0000000
--- a/dependency/AndroidTest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS VNDK dependency test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-vndk" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="HostDrivenTest.push" />
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsVndkDependency" />
-        <option name="test-case-path" value="vts/testcases/vndk/dependency/VtsVndkDependencyTest" />
-        <option name="test-timeout" value="6m" />
-    </test>
-</configuration>
-
diff --git a/dependency/OWNERS b/dependency/OWNERS
new file mode 100644
index 0000000..c8244dd
--- /dev/null
+++ b/dependency/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 170896
+hsinyichen@google.com
diff --git a/dependency/vts_vndk_dependency_test.py b/dependency/vts_vndk_dependency_test.py
index fb0431a..ff62885 100644
--- a/dependency/vts_vndk_dependency_test.py
+++ b/dependency/vts_vndk_dependency_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2020 The Android Open Source Project
 #
@@ -48,6 +48,7 @@ class VtsVndkDependencyTest(unittest.TestCase):
         _vndk_sp: Set of strings. The names of VNDK-SP libraries.
         _SP_HAL_LINK_PATHS: Format strings of same-process HAL's link paths.
         _VENDOR_LINK_PATHS: Format strings of vendor processes' link paths.
+        _VENDOR_APP_DIRS: The app directories in vendor partitions.
     """
     _TARGET_DIR_SEP = "/"
     _TARGET_ROOT_DIR = "/"
@@ -62,6 +63,9 @@ class VtsVndkDependencyTest(unittest.TestCase):
         "/odm/{LIB}/hw", "/odm/{LIB}/egl", "/odm/{LIB}",
         "/vendor/{LIB}/hw", "/vendor/{LIB}/egl", "/vendor/{LIB}"
     ]
+    _VENDOR_APP_DIRS = [
+        "/vendor/app", "/vendor/priv-app", "/odm/app", "/odm/priv-app"
+    ]
     _DEFAULT_PROGRAM_INTERPRETERS = [
         "/system/bin/linker", "/system/bin/linker64"
     ]
@@ -77,9 +81,11 @@ class VtsVndkDependencyTest(unittest.TestCase):
             bitness: Integer. Bitness of the ELF.
             deps: List of strings. The names of the depended libraries.
             runpaths: List of strings. The library search paths.
+            custom_link_paths: List of strings. The library search paths.
         """
 
-        def __init__(self, target_path, bitness, deps, runpaths):
+        def __init__(self, target_path, bitness, deps, runpaths,
+                     custom_link_paths):
             self.target_path = target_path
             self.name = target_path_module.basename(target_path)
             self.target_dir = target_path_module.dirname(target_path)
@@ -94,6 +100,7 @@ class VtsVndkDependencyTest(unittest.TestCase):
                 path = path.replace("${ORIGIN}", self.target_dir)
                 path = path.replace("$ORIGIN", self.target_dir)
                 self.runpaths.append(path)
+            self.custom_link_paths = custom_link_paths
 
     def setUp(self):
         """Initializes device, temporary directory, and VNDK lists."""
@@ -259,8 +266,16 @@ class VtsVndkDependencyTest(unittest.TestCase):
             if runpaths:
                 logging.info("%s has runpaths: %s",
                              target_path, ":".join(runpaths))
+
+            # b/123216664 App libraries depend on those in the same directory.
+            custom_link_paths = []
+            if any(target_path.startswith(app_dir + self._TARGET_DIR_SEP) for
+                    app_dir in self._VENDOR_APP_DIRS):
+                custom_link_paths.append(
+                    target_path_module.dirname(target_path))
+
             objs.append(self.ElfObject(target_path, elf.bitness, deps,
-                                       runpaths))
+                                       runpaths, custom_link_paths))
         return objs
 
     def _FindLibsInLinkPaths(self, bitness, link_paths, objs):
@@ -299,7 +314,7 @@ class VtsVndkDependencyTest(unittest.TestCase):
             return
         searched.add(lib)
         for dep_name in lib.deps:
-            for link_path in lib.runpaths + link_paths:
+            for link_path in lib.custom_link_paths + lib.runpaths + link_paths:
                 if dep_name in namespace[link_path]:
                     self._DfsDependencies(namespace[link_path][dep_name],
                                           searched, namespace, link_paths)
@@ -327,7 +342,7 @@ class VtsVndkDependencyTest(unittest.TestCase):
                 if any((dep_name in vndk_list) for vndk_list in vndk_lists):
                     continue
                 if any((dep_name in namespace[link_path]) for link_path in
-                       obj.runpaths + link_paths):
+                       obj.custom_link_paths + obj.runpaths + link_paths):
                     continue
                 disallowed_libs.append(dep_name)
 
@@ -350,8 +365,8 @@ class VtsVndkDependencyTest(unittest.TestCase):
 
         vendor_link_paths = [vndk_utils.FormatVndkPath(x, bitness) for
                              x in self._VENDOR_LINK_PATHS]
-        vendor_namespace = self._FindLibsInLinkPaths(bitness,
-                                                     vendor_link_paths, objs)
+        vendor_namespace = self._FindLibsInLinkPaths(
+            bitness, vendor_link_paths + self._VENDOR_APP_DIRS, objs)
         # Exclude VNDK and VNDK-SP extensions from vendor libraries.
         for vndk_ext_dir in (vndk_utils.GetVndkExtDirectories(bitness) +
                              vndk_utils.GetVndkSpExtDirectories(bitness)):
diff --git a/files/Android.bp b/files/Android.bp
deleted file mode 100644
index f2ff97c..0000000
--- a/files/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-vts_config {
-    name: "VtsVndkFiles",
-}
diff --git a/files/AndroidTest.xml b/files/AndroidTest.xml
deleted file mode 100644
index b422922..0000000
--- a/files/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS VNDK files test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-vndk" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="push-group" value="HostDrivenTest.push" />
-    </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
-    </multi_target_preparer>
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsVndkFiles" />
-        <option name="test-case-path" value="vts/testcases/vndk/files/VtsVndkFilesTest" />
-    </test>
-</configuration>
-
diff --git a/files/OWNERS b/files/OWNERS
new file mode 100644
index 0000000..c8244dd
--- /dev/null
+++ b/files/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 170896
+hsinyichen@google.com
diff --git a/golden/Android.bp b/golden/Android.bp
index c9abdaa..61ea604 100644
--- a/golden/Android.bp
+++ b/golden/Android.bp
@@ -12,17 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 python_binary_host {
     name: "extract_lsdump",
     main: "extract_lsdump.py",
     srcs: ["extract_lsdump.py"],
     version: {
         py2: {
-            enabled: true,
-            embedded_launcher: true,
+            enabled: false,
         },
         py3: {
-            enabled: false,
+            enabled: true,
+            embedded_launcher: true,
         },
     }
 }
diff --git a/golden/extract_lsdump.py b/golden/extract_lsdump.py
index fd42be6..8849d48 100755
--- a/golden/extract_lsdump.py
+++ b/golden/extract_lsdump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2018 The Android Open Source Project
 #
@@ -19,6 +19,7 @@ import argparse
 import gzip
 import json
 import os
+import sys
 import zipfile
 
 
@@ -45,27 +46,27 @@ class AttrDict(dict):
 def _GetTypeSymbol(record_type):
     """Gets the mangled name of a record type.
 
-    Before Android R, unique_id was mangled name starting with "_ZTS".
+    Before Android R, unique_id was mangled name starting with '_ZTS'.
     linker_set_key was unmangled.
     Since Android R, unique_id has been removed, and linker_set_key has
-    been changed to mangled name starting with "_ZTI".
+    been changed to mangled name starting with '_ZTI'.
 
     Args:
         record_type: An AttrDict, a record type in lsdump.
 
     Returns:
-        A string, the mangled name starting with "_ZTI".
+        A string, the mangled name starting with '_ZTI'.
     """
-    if "unique_id" in record_type:
-        return record_type["unique_id"].replace("_ZTS", "_ZTI", 1)
-    return record_type["linker_set_key"]
+    if 'unique_id' in record_type:
+        return record_type['unique_id'].replace('_ZTS', '_ZTI', 1)
+    return record_type['linker_set_key']
 
 
 def _OpenFileOrGzipped(file_name):
     """Opens a file that is either in gzip or uncompressed format.
 
-    If file_name ends with '.gz' then return gzip.open(file_name, 'rb'),
-    else return open(file_name, 'rb').
+    If file_name ends with '.gz' then an opened gzip text file, else return an
+    opened text file.
 
     Args:
         file_name: The file name to open.
@@ -77,8 +78,8 @@ def _OpenFileOrGzipped(file_name):
         IOError if fails to open.
     """
     if file_name.endswith('.gz'):
-        return gzip.open(file_name, 'rb')
-    return open(file_name, 'rb')
+        return gzip.open(file_name, 'rt')
+    return open(file_name, 'r')
 
 
 def _ConsumeOffset(tok, beg=0):
@@ -235,8 +236,8 @@ def _ParseLsdumpFileObject(lsdump_file):
 def _ParseLsdumpZipFile(lsdump_zip, output_zip):
     """Converts zipped lsdump files to the dump files for ABI test."""
     for name in lsdump_zip.namelist():
-        if name.endswith(".lsdump"):
-            with lsdump_zip.open(name, mode="r") as lsdump_file:
+        if name.endswith('.lsdump'):
+            with lsdump_zip.open(name, mode='r') as lsdump_file:
                 output_dump = _ParseLsdumpFileObject(lsdump_file)
             output_str = json.dumps(output_dump, indent=1,
                                     separators=(',', ':'))
@@ -262,7 +263,7 @@ def ParseLsdumpFile(input_path, output_path):
 
         with _OpenFileOrGzipped(input_path) as lsdump_file:
             output_dump = _ParseLsdumpFileObject(lsdump_file)
-        with open(output_path, 'wb') as output_file:
+        with open(output_path, 'w') as output_file:
             json.dump(output_dump, output_file,
                       indent=1, separators=(',', ':'))
     except (IOError, OSError) as e:
@@ -288,13 +289,13 @@ def main():
             with zipfile.ZipFile(args.output_path, mode='w',
                                  compression=zipfile.ZIP_STORED) as output_zip:
                 _ParseLsdumpZipFile(input_zip, output_zip)
-        exit(0)
+        sys.exit(0)
 
     try:
         ParseLsdumpFile(args.input_path, args.output_path)
     except LsdumpError as e:
         print(e)
-        exit(1)
+        sys.exit(1)
 
 
 if __name__ == '__main__':
diff --git a/golden/vndk_data.py b/golden/vndk_data.py
index 5e971aa..56ed5d4 100644
--- a/golden/vndk_data.py
+++ b/golden/vndk_data.py
@@ -52,8 +52,8 @@ _ABI_LIST = (
     ("arm64", 64, "arm64_armv8-a"),
     ("arm64", 32, "arm_armv8-a"),
     ("arm", 32, "arm_armv7-a-neon"),
-    ("x86_64", 64, "x86_x86_64"),
-    ("x86_64", 32, "x86_64"),
+    ("x86_64", 64, "x86_64"),
+    ("x86_64", 32, "x86_x86_64"),
     ("x86", 32, "x86"),
 )
 
diff --git a/hidl/bufferpool/V1_0/target/Android.bp b/hidl/bufferpool/V1_0/target/Android.bp
deleted file mode 100644
index f4f798f..0000000
--- a/hidl/bufferpool/V1_0/target/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-vts_config {
-    name: "VtsVndkHidlBufferpoolV1_0Target",
-}
diff --git a/hidl/bufferpool/V1_0/target/AndroidTest.xml b/hidl/bufferpool/V1_0/target/AndroidTest.xml
deleted file mode 100644
index b1c11d0..0000000
--- a/hidl/bufferpool/V1_0/target/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS VtsVndkHidlBufferpoolV1_0Target test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-library" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="abort-on-push-failure" value="false"/>
-        <option name="push-group" value="HostDrivenTest.push"/>
-    </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsVndkHidlBufferpoolV1_0Target"/>
-        <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsVndkHidlBufferpoolV1_0TargetSingleTest/VtsVndkHidlBufferpoolV1_0TargetSingleTest"/>
-        <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsVndkHidlBufferpoolV1_0TargetSingleTest/VtsVndkHidlBufferpoolV1_0TargetSingleTest"/>
-        <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsVndkHidlBufferpoolV1_0TargetMultiTest/VtsVndkHidlBufferpoolV1_0TargetMultiTest"/>
-        <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsVndkHidlBufferpoolV1_0TargetMultiTest/VtsVndkHidlBufferpoolV1_0TargetMultiTest"/>
-        <option name="binary-test-type" value="gtest_binary_test"/>
-        <option name="test-timeout" value="1m"/>
-    </test>
-</configuration>
diff --git a/hidl/bufferpool/V2_0/target/Android.bp b/hidl/bufferpool/V2_0/target/Android.bp
deleted file mode 100644
index 9533bab..0000000
--- a/hidl/bufferpool/V2_0/target/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (C) 2018 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-vts_config {
-    name: "VtsVndkHidlBufferpoolV2_0Target",
-}
diff --git a/hidl/bufferpool/V2_0/target/AndroidTest.xml b/hidl/bufferpool/V2_0/target/AndroidTest.xml
deleted file mode 100644
index d3241e9..0000000
--- a/hidl/bufferpool/V2_0/target/AndroidTest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for VTS VtsVndkHidlBufferpoolV2_0Target test cases">
-    <option name="config-descriptor:metadata" key="plan" value="vts-library" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
-        <option name="abort-on-push-failure" value="false"/>
-        <option name="push-group" value="HostDrivenTest.push"/>
-    </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
-    <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
-        <option name="test-module-name" value="VtsVndkHidlBufferpoolV2_0Target"/>
-        <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsVndkHidlBufferpoolV2_0TargetSingleTest/VtsVndkHidlBufferpoolV2_0TargetSingleTest"/>
-        <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsVndkHidlBufferpoolV2_0TargetSingleTest/VtsVndkHidlBufferpoolV2_0TargetSingleTest"/>
-        <option name="binary-test-source" value="_32bit::DATA/nativetest/VtsVndkHidlBufferpoolV2_0TargetMultiTest/VtsVndkHidlBufferpoolV2_0TargetMultiTest"/>
-        <option name="binary-test-source" value="_64bit::DATA/nativetest64/VtsVndkHidlBufferpoolV2_0TargetMultiTest/VtsVndkHidlBufferpoolV2_0TargetMultiTest"/>
-        <option name="binary-test-type" value="gtest_binary_test"/>
-        <option name="test-timeout" value="1m"/>
-    </test>
-</configuration>
diff --git a/utils.py b/utils.py
index c6e13c2..8bf00f3 100644
--- a/utils.py
+++ b/utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2020 The Android Open Source Project
 #
@@ -32,7 +32,10 @@ class AndroidDevice(object):
 
     def AdbPull(self, src, dst):
         cmd = ["adb", "-s", self._serial_number, "pull", src, dst]
-        subprocess.check_call(cmd, shell=False, stdin=subprocess.PIPE,
+        env = os.environ.copy()
+        if "ADB_COMPRESSION" not in env:
+            env["ADB_COMPRESSION"] = "0"
+        subprocess.check_call(cmd, shell=False, env=env, stdin=subprocess.PIPE,
                               stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     def Execute(self, *args):