commit a49b8d22f47b88f0598f8981216fc20cdd16697d
author David Anderson <dvander@google.com> Mon Aug 07 22:31:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 07 22:31:34 2023 +0000
tree f0a35f662fa23bc74b5f98f2b5c1594415911d75
parent a28b62e0c76c8330b41ca907c5ed53073fba6c75
parent a392fa3c7823d59d0c2e5dae1695969a1ca0e486

Merge changes Ie9a781e4,I060788c9,Ie75e9440 into main

* changes:
  snapuserd: Remove dm-user specific code from ReadWorker.
  snapuserd: Add an IBlockServer abstraction around dm-user.
  snapuserd: Rename snapuserd_merge to merge_worker.

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 0bd07ed..3644d95 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1944,7 +1944,6 @@
     }
     ZipImageSource zp = ZipImageSource(zip);
     fp->source = &zp;
-    fp->wants_wipe = false;
     FlashAllTool tool(fp);
     tool.Flash();
 

libcutils/fs_config.cpp

diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index f90a1bc..26ac576 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -214,6 +214,7 @@
 #endif
     { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/resize2fs" },
     { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/snapuserd" },
+    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/snapuserd_ramdisk" },
     { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/tune2fs" },
     { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/fsck.f2fs" },
     // generic defaults

libcutils/include/cutils/threads.h

diff --git a/libcutils/include/cutils/threads.h b/libcutils/include/cutils/threads.h
index 1886184..92564b8 100644
--- a/libcutils/include/cutils/threads.h
+++ b/libcutils/include/cutils/threads.h
@@ -23,18 +23,3 @@
 #else
 #include <pthread.h>
 #endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//
-// Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows.
-//
-#if !defined(__GLIBC__) || __GLIBC__ >= 2 && __GLIBC_MINOR__ < 30
-extern pid_t gettid();
-#endif
-
-#ifdef __cplusplus
-}
-#endif

libcutils/threads.cpp

diff --git a/libcutils/threads.cpp b/libcutils/threads.cpp
index 2638720..cca50c1 100644
--- a/libcutils/threads.cpp
+++ b/libcutils/threads.cpp
@@ -14,11 +14,13 @@
 ** limitations under the License.
 */
 
-#include <cutils/threads.h>
+#include <sys/types.h>
 
 #if defined(__APPLE__)
+#include <pthread.h>
 #include <stdint.h>
 #elif defined(__linux__)
+#include <pthread.h>
 #include <syscall.h>
 #include <unistd.h>
 #elif defined(_WIN32)
@@ -29,7 +31,7 @@
 // No definition needed for Android because we'll just pick up bionic's copy.
 // No definition needed for Glibc >= 2.30 because it exposes its own copy.
 #else
-pid_t gettid() {
+extern "C" pid_t gettid() {
 #if defined(__APPLE__)
   uint64_t tid;
   pthread_threadid_np(NULL, &tid);