commit 6fe7045e0e24f3b238815f01052076ad353ca708
author Josh Gao <jmgao@google.com> Thu Jan 26 23:11:20 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 26 23:11:21 2017 +0000
tree bf39d7f6b195e4cdfbc792d489c728f1f90685d6
parent 6f9a034cb90ad4009cfa0a9aae7cdedec2853ed9
parent e5288f292a2565e276098b5f0e60ee93bb7e10a5

Merge "debuggerd_handler: remove PR_SET_DUMPABLE check."

adb/client/usb_osx.cpp

diff --git a/adb/client/usb_osx.cpp b/adb/client/usb_osx.cpp
index e541f6e..d4fc7c0 100644
--- a/adb/client/usb_osx.cpp
+++ b/adb/client/usb_osx.cpp
@@ -44,6 +44,7 @@
 
 using namespace std::chrono_literals;
 
+namespace native {
 struct usb_handle
 {
     UInt8 bulkIn;
@@ -298,7 +299,8 @@
         usb_handle* handle_p = handle.get();
         VLOG(USB) << "Add usb device " << serial;
         AddDevice(std::move(handle));
-        register_usb_transport(handle_p, serial, devpath.c_str(), 1);
+        register_usb_transport(reinterpret_cast<::usb_handle*>(handle_p), serial, devpath.c_str(),
+                               1);
     }
 }
 
@@ -558,3 +560,4 @@
     std::lock_guard<std::mutex> lock_guard(g_usb_handles_mutex);
     usb_kick_locked(handle);
 }
+} // namespace native

init/seccomp.cpp

diff --git a/init/seccomp.cpp b/init/seccomp.cpp
index d632302..a90a137 100644
--- a/init/seccomp.cpp
+++ b/init/seccomp.cpp
@@ -213,6 +213,9 @@
     // Needed for kernel to restart syscalls
     AllowSyscall(f, 0);  // __NR_restart_syscall
 
+    // Needed for debugging 32-bit Chrome
+    AllowSyscall(f, 42); // __NR_pipe
+
     // arm32-on-arm64 only filter - autogenerated from bionic syscall usage
     for (size_t i = 0; i < arm_filter_size; ++i)
         f.push_back(arm_filter[i]);