Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a6daa62 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5485752 from 2b107b8b to qt-release 

Change-Id: I6a838f8e7174fa66ead5068d683e8fbc9db0e839
parents 03f75d4f 2b107b8b

adb/daemon/usb.cpp

+3 −2
Original line number Diff line number Diff line
@@ -57,11 +57,12 @@ using android::base::StringPrintf; 
// We can't find out whether we have support for AIO on ffs endpoints until we submit a read.

static std::optional<bool> gFfsAioSupported;



// Not all USB controllers support operations larger than 16k, so don't go above that.

static constexpr size_t kUsbReadQueueDepth = 32;

static constexpr size_t kUsbReadSize = 8 * PAGE_SIZE;

static constexpr size_t kUsbReadSize = 4 * PAGE_SIZE;



static constexpr size_t kUsbWriteQueueDepth = 32;

static constexpr size_t kUsbWriteSize = 8 * PAGE_SIZE;

static constexpr size_t kUsbWriteSize = 4 * PAGE_SIZE;



static const char* to_string(enum usb_functionfs_event_type type) {

    switch (type) {

debuggerd/crash_dump.cpp

+6 −0
Original line number Diff line number Diff line
@@ -363,6 +363,12 @@ int main(int argc, char** argv) { 
  DefuseSignalHandlers();

  InstallSigPipeHandler();



  // There appears to be a bug in the kernel where our death causes SIGHUP to

  // be sent to our process group if we exit while it has stopped jobs (e.g.

  // because of wait_for_gdb). Use setsid to create a new process group to

  // avoid hitting this.

  setsid();



  atrace_begin(ATRACE_TAG, "before reparent");

  pid_t target_process = getppid();

debuggerd/handler/debuggerd_handler.cpp

+9 −2
Original line number Diff line number Diff line
@@ -268,8 +268,15 @@ static void create_vm_process() { 
      _exit(errno);

    }



    // Exit immediately on both sides of the fork.

    // crash_dump is ptracing us, so it'll get to do whatever it wants in between.

    // crash_dump is ptracing both sides of the fork; it'll let the parent exit,

    // but keep the orphan stopped to peek at its memory.



    // There appears to be a bug in the kernel where our death causes SIGHUP to

    // be sent to our process group if we exit while it has stopped jobs (e.g.

    // because of wait_for_gdb). Use setsid to create a new process group to

    // avoid hitting this.

    setsid();



    _exit(0);

  }

rootdir/etc/ld.config.legacy.txt

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ namespace.media.asan.search.paths = /apex/com.android.media/${LIB} 
namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors



namespace.media.links = default

namespace.media.link.default.shared_libs  = libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += libc.so

namespace.media.link.default.shared_libs += libcgrouprc.so

rootdir/etc/ld.config.txt

+0 −2
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors 


namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += libmediametrics.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@@ -620,7 +619,6 @@ namespace.media.permitted.paths = /apex/com.android.media/${LIB}/extractors 


namespace.media.links = default

namespace.media.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.media.link.default.shared_libs += libandroid.so

namespace.media.link.default.shared_libs += libbinder_ndk.so

namespace.media.link.default.shared_libs += libmediametrics.so

namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%