commit 8650e89619e791239edcd57d88c17f348fe33e02
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 16 19:05:55 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 16 19:05:55 2023 +0000
tree 57014f03599e4438f9c3efd0957ce039fcdaa686
parent 74a858c03904bb7bd096bf9f2dc330e6bae8c814
parent 2f51e7564194653ef5371179584853b5f39881d1

Merge "Clean up ANGLE integration logic." into main

cmds/servicemanager/Android.bp

diff --git a/cmds/servicemanager/Android.bp b/cmds/servicemanager/Android.bp
index d73a30b..e00c2a2 100644
--- a/cmds/servicemanager/Android.bp
+++ b/cmds/servicemanager/Android.bp
@@ -24,7 +24,6 @@
 
     shared_libs: [
         "libbase",
-        "libbinder", // also contains servicemanager_interface
         "libvintf",
         "libcutils",
         "liblog",
@@ -33,6 +32,21 @@
     ],
 
     target: {
+        android: {
+            shared_libs: [
+                "libbinder",
+                "libutils",
+            ],
+        },
+        host: {
+            static_libs: [
+                "libbinder",
+                "libutils",
+            ],
+        },
+        darwin: {
+            enabled: false,
+        },
         vendor: {
             exclude_shared_libs: ["libvintf"],
         },

libs/binder/tests/parcel_fuzzer/random_fd.cpp

diff --git a/libs/binder/tests/parcel_fuzzer/random_fd.cpp b/libs/binder/tests/parcel_fuzzer/random_fd.cpp
index 7390d49..4a9bd07 100644
--- a/libs/binder/tests/parcel_fuzzer/random_fd.cpp
+++ b/libs/binder/tests/parcel_fuzzer/random_fd.cpp
@@ -51,7 +51,9 @@
 
                  int flags = O_CLOEXEC;
                  if (provider->ConsumeBool()) flags |= O_DIRECT;
-                 if (provider->ConsumeBool()) flags |= O_NONBLOCK;
+
+                 // TODO(b/236812909): also test blocking
+                 if (true) flags |= O_NONBLOCK;
 
                  CHECK_EQ(0, pipe2(pipefds, flags)) << flags;