commit 1fe267fe1f195d0c77223ff5cf4a9c35124211e3
author Paul Thomson <paulthomson@google.com> Thu Apr 14 15:36:27 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 14 15:36:27 2022 +0000
tree 6ef4a3b9c17ae8b547dcbbd6e0e1f5ffb6332440
parent 635170436dacbd94582735c3c96963e81523b1f0
parent c4f7c041673481207fa4af2ce008ecd292c3c852

Merge "Add dEQP level 2022 prebuilts"

cmds/installd/TEST_MAPPING

diff --git a/cmds/installd/TEST_MAPPING b/cmds/installd/TEST_MAPPING
index 8ccab4c..fc4cfc9 100644
--- a/cmds/installd/TEST_MAPPING
+++ b/cmds/installd/TEST_MAPPING
@@ -32,7 +32,12 @@
       "name": "CtsCompilationTestCases"
     },
     {
-      "name": "SdkSandboxStorageHostTest"
+      "name": "SdkSandboxStorageHostTest",
+      "options": [
+        {
+          "exclude-annotation": "android.platform.test.annotations.LargeTest"
+        }
+      ]
     }
   ]
 }

libs/binder/tests/parcel_fuzzer/Android.bp

diff --git a/libs/binder/tests/parcel_fuzzer/Android.bp b/libs/binder/tests/parcel_fuzzer/Android.bp
index 57d496d..e5d32da 100644
--- a/libs/binder/tests/parcel_fuzzer/Android.bp
+++ b/libs/binder/tests/parcel_fuzzer/Android.bp
@@ -29,7 +29,6 @@
         "libcutils",
         "libhidlbase",
         "liblog",
-        "libutils",
     ],
 
     target: {
@@ -37,12 +36,14 @@
             shared_libs: [
                 "libbinder_ndk",
                 "libbinder",
+                "libutils",
             ],
         },
         host: {
             static_libs: [
                 "libbinder_ndk",
                 "libbinder",
+                "libutils",
             ],
         },
         darwin: {