72 files changed, 2288 insertions, 3417 deletions

diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf
deleted file mode 100644
index ddf155a907..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Service]
-ExecStartPre=/usr/bin/android-gadget-setup
-ExecStartPost=/usr/bin/android-gadget-start
-ExecStopPost=/usr/bin/android-gadget-cleanup
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup
deleted file mode 100644
index 47e4edb9be..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-conf="Conf 1"
-manufacturer=RPB
-model="Android device"
-product=0xd002
-serial=0123456789ABCDEF
-vendor=0x18d1
-
-if [ -r /etc/android-gadget-setup.machine ] ; then
-        . /etc/android-gadget-setup.machine
-fi
-
-[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite
-
-cd /sys/kernel/config/usb_gadget
-
-[ -d adb ] && /usr/bin/android-gadget-cleanup || true
-
-mkdir adb
-cd adb
-
-mkdir configs/c.1
-mkdir functions/ffs.usb0
-mkdir strings/0x409
-mkdir configs/c.1/strings/0x409
-echo -n "$vendor"  > idVendor
-echo -n "$product" > idProduct
-echo "$serial" > strings/0x409/serialnumber
-echo "$manufacturer" > strings/0x409/manufacturer
-echo "$model" > strings/0x409/product
-echo "$conf" > configs/c.1/strings/0x409/configuration
-ln -s functions/ffs.usb0 configs/c.1
-
-mkdir -p /dev/usb-ffs/adb
-mount -t functionfs usb0 /dev/usb-ffs/adb
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start
deleted file mode 100644
index 76b5e29624..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-sleep 10
-
-ls /sys/class/udc/ | head -n 1 | xargs echo -n > /sys/kernel/config/usb_gadget/adb/UDC
-
-echo "Setting UDC $(ls /sys/class/udc/ | head -n 1) for USB ADB Gadget usage"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
deleted file mode 100644
index 342e7fd1a5..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "Different utilities from Android - corressponding configuration files for using ConfigFS"
-SECTION = "console/utils"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-S = "${UNPACKDIR}"
-
-SRC_URI = " \
-    file://android-gadget-setup \
-    file://android-gadget-start \
-    file://android-gadget-cleanup \
-    file://10-adbd-configfs.conf \
-"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
-    install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
-
-    if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
-        install -d ${D}${sysconfdir}
-        install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
-    fi
-
-    install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-    install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-}
-
-FILES:${PN} += " \
-    ${systemd_unitdir}/system/ \
-"
-
-PROVIDES += "android-tools-conf"
-RPROVIDES:${PN} = "android-tools-conf"
-BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf b/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf
new file mode 100644
index 0000000000..7971f319c3
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf
@@ -0,0 +1,7 @@
+[Service]
+# adbd uses sd_notify to signal readiness; ExecStartPost runs only after
+# READY=1 is sent, so no delay is needed before activating the UDC.
+Environment=ANDROID_GADGET_UDC_DELAY=0
+ExecStartPre=/usr/bin/android-gadget-setup
+ExecStartPost=/usr/bin/android-gadget-start
+ExecStopPost=/usr/bin/android-gadget-cleanup
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup
index f27d77df51..f27d77df51 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-cleanup
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
index 26cf30eddd..2744d1e98e 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
@@ -1,37 +1,40 @@
 #!/bin/sh
 
-[ ! -e /dev/pts ] && mkdir -p /dev/pts
-[ ! -e /dev/pts/0 ] && mount devpts /dev/pts -t devpts
-
-# TODO enable the lines below once we have support for getprop
-# retrieve the product info from Android
-# manufacturer=$(getprop ro.product.manufacturer Android)
-# model=$(getprop ro.product.model Android)
-# serial=$(getprop ro.serialno 0123456789ABCDEF)
-
-#below are now needed in order to use FunctionFS for ADB, tested to work with 3.4+ kernels
-if grep -q functionfs /proc/filesystems; then
-    mkdir -p /dev/usb-ffs/adb
-    mount -t functionfs adb /dev/usb-ffs/adb
-    #android-gadget-setup doesn't provide below 2 and without them it won't work, so we provide them here.
-    echo adb > /sys/class/android_usb/android0/f_ffs/aliases
-    echo ffs > /sys/class/android_usb/android0/functions
+set -e
+
+conf="Conf 1"
+manufacturer=RPB
+model="Android device"
+product=0xd002
+serial=0123456789ABCDEF
+vendor=0x18d1
+
+if [ -r /etc/android-gadget-setup.machine ] ; then
+        . /etc/android-gadget-setup.machine
 fi
 
-manufacturer="$(cat /system/build.prop | grep -o 'ro.product.manufacturer=.*' | cut -d'=' -f 2)"
-model="$(cat /system/build.prop | grep -o 'ro.product.model=.*' | cut -d'=' -f 2)"
-# get the device serial number from /proc/cmdline directly(since we have no getprop on
-# GNU/Linux)
-serial="$(cat /proc/cmdline | sed 's/.*androidboot.serialno=//' | sed 's/ .*//')"
+[ -d /sys/kernel/config/usb_gadget ] || modprobe libcomposite
+
+cd /sys/kernel/config/usb_gadget
+
+[ -d adb ] && /usr/bin/android-gadget-cleanup || true
 
-echo $serial > /sys/class/android_usb/android0/iSerial
-echo $manufacturer > /sys/class/android_usb/android0/iManufacturer
-echo $model > /sys/class/android_usb/android0/iProduct
+mkdir adb
+cd adb
 
-echo "0" > /sys/class/android_usb/android0/enable
-echo "18d1" > /sys/class/android_usb/android0/idVendor
-echo "D002" > /sys/class/android_usb/android0/idProduct
-echo "adb" > /sys/class/android_usb/android0/functions
-echo "1" >  /sys/class/android_usb/android0/enable
+mkdir configs/c.1
+mkdir functions/ffs.usb0
+mkdir strings/0x409
+mkdir configs/c.1/strings/0x409
+echo -n "$vendor"  > idVendor
+echo -n "$product" > idProduct
+echo "$serial" > strings/0x409/serialnumber
+echo "$manufacturer" > strings/0x409/manufacturer
+echo "$model" > strings/0x409/product
+echo "$conf" > configs/c.1/strings/0x409/configuration
+ln -s functions/ffs.usb0 configs/c.1
 
-sleep 4
+mkdir -p /dev/usb-ffs/adb
+ADB_UID=$(id -u adb)
+ADB_GID=$(id -g adb)
+mount -t functionfs usb0 /dev/usb-ffs/adb -o "uid=$ADB_UID,gid=$ADB_GID"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-start b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-start
new file mode 100644
index 0000000000..4ea688accb
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-start
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+# Wait for adbd to open ep0 before activating the UDC. Without systemd
+# sd_notify synchronisation there is no other signal that adbd is ready, so
+# a fixed delay is used. When this script is invoked via ExecStartPost in a
+# Type=notify service, adbd has already sent READY=1 before this runs and
+# no delay is needed; set ANDROID_GADGET_UDC_DELAY=0 in that case (e.g. via
+# a systemd drop-in Environment= line).
+ANDROID_GADGET_UDC_DELAY="${ANDROID_GADGET_UDC_DELAY:-10}"
+sleep "$ANDROID_GADGET_UDC_DELAY"
+
+ls /sys/class/udc/ | head -n 1 | xargs echo -n > /sys/kernel/config/usb_gadget/adb/UDC
+
+echo "Setting UDC $(ls /sys/class/udc/ | head -n 1) for USB ADB Gadget usage"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
index 764d6b404f..bb55b3599f 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
@@ -1,22 +1,40 @@
-DESCRIPTION = "Different utilities from Android - corressponding configuration files"
+DESCRIPTION = "Different utilities from Android - corresponding configuration files for using ConfigFS"
 SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-SRC_URI = "file://android-gadget-setup"
-
 S = "${UNPACKDIR}"
 
+SRC_URI = " \
+    file://android-gadget-setup \
+    file://android-gadget-start \
+    file://android-gadget-cleanup \
+    file://10-adbd-configfs.conf \
+"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
     install -d ${D}${bindir}
     install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
-}
+    install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
 
-python () {
-    pn = d.getVar('PN')
-    profprov = d.getVar("PREFERRED_PROVIDER_" + pn)
-    if profprov and pn != profprov:
-        raise bb.parse.SkipRecipe("PREFERRED_PROVIDER_%s set to %s, not %s" % (pn, profprov, pn))
+    if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
+        install -d ${D}${sysconfdir}
+        install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
+    fi
+
+    install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
+    install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
 }
+
+FILES:${PN} += " \
+    ${systemd_unitdir}/system/ \
+"
+
+PROVIDES += "android-tools-conf-configfs"
+RPROVIDES:${PN} = "android-tools-conf-configfs"
+RREPLACES:${PN} = "android-tools-conf-configfs"
+RCONFLICTS:${PN} = "android-tools-conf-configfs"
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0001-libbacktrace.mk-Link-against-staged-lib7z.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0001-libbacktrace.mk-Link-against-staged-lib7z.patch
new file mode 100644
index 0000000000..845e267c41
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0001-libbacktrace.mk-Link-against-staged-lib7z.patch
@@ -0,0 +1,38 @@
+From 1eab8bc4974c887c09d6b444c5198ec4c0932b36 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Fri, 8 May 2026 12:10:00 +0000
+Subject: [PATCH] libbacktrace.mk: Link against staged lib7z
+
+In the Yocto target sysroot, p7zip installs `lib7z.so` under `/usr/lib`.
+The Debian make fragment hardcodes `/usr/lib/7zip` and links `-l:7z.so`,
+which does not exist in this environment and causes link failure.
+
+Use the standard sysroot library search path and link against `-l7z`
+instead.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ debian/system/libbacktrace.mk | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/debian/system/libbacktrace.mk b/debian/system/libbacktrace.mk
+index b106c24..0f798d4 100644
+--- a/debian/system/libbacktrace.mk
++++ b/debian/system/libbacktrace.mk
+@@ -64,13 +64,11 @@ CPPFLAGS += \
+   -Isystem/unwinding/libunwindstack/include \
+ 
+ LDFLAGS += \
+-  -L/usr/lib/7zip \
+   -Ldebian/out/external \
+   -Ldebian/out/system \
+   -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -Wl,-rpath=/usr/lib/7zip \
+   -Wl,-soname,$(NAME).so.0 \
+-  -l:7z.so \
++  -l7z \
+   -lbase \
+   -llog \
+   -lpthread \
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0002-debian-makefiles-yocto-compat.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0002-debian-makefiles-yocto-compat.patch
new file mode 100644
index 0000000000..a7c8dcf946
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0002-debian-makefiles-yocto-compat.patch
@@ -0,0 +1,240 @@
+From 14058ff506910f19c6e6a49e2bb081c398a7acf0 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Sun, 10 May 2026 15:20:00 +0000
+Subject: [PATCH] debian makefiles: adapt for cross-compilation in Yocto
+
+The Debian make fragments hardcode several assumptions that only work on
+a Debian build host:
+ - include /usr/share/dpkg/architecture.mk (shells out to dpkg-architecture)
+ - /usr/include/android (host path, not sysroot)
+ - /usr/lib/$(DEB_HOST_MULTIARCH)/android (host rpath)
+ - -lcrypto / -lssl (links against system OpenSSL instead of BoringSSL)
+ - -Wexit-time-destructors (Clang-only, rejected by GCC)
+
+Replace each with its Yocto-compatible equivalent: use $(SYSROOT) for
+include paths, rpath relative to $ORIGIN for installed libraries, exact
+soname matching for the staged BoringSSL shared objects, and drop the
+Clang-only warning flag.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ debian/system/adb.mk                  |  9 ++++-----
+ debian/system/adbd.mk                 | 10 ++++------
+ debian/system/extras/libext4_utils.mk |  4 ++--
+ debian/system/fastboot.mk             | 13 ++++++-------
+ debian/system/libadb.mk               |  3 +--
+ debian/system/libbacktrace.mk         |  2 +-
+ debian/system/libbase.mk              |  2 +-
+ debian/system/libcrypto_utils.mk      |  2 +-
+ debian/system/libcutils.mk            |  2 +-
+ debian/system/liblog.mk               |  1 +
+ debian/system/libutils.mk             |  3 +--
+ 11 files changed, 23 insertions(+), 28 deletions(-)
+
+diff --git a/debian/system/adb.mk b/debian/system/adb.mk
+index 89530b0..90a816f 100644
+--- a/debian/system/adb.mk
++++ b/debian/system/adb.mk
+@@ -82,22 +82,21 @@ CPPFLAGS += \
+   -Isystem/libbase/include \
+   -Isystem/libziparchive/include \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN/../lib/android' \
+   -lbase \
+   -lbrotlidec \
+   -lbrotlienc \
+-  -lcrypto \
++  -l:libcrypto.so.0 \
+   -lcutils \
+   -llog \
+   -llz4 \
+   -lprotobuf \
+   -lpthread \
+-  -lssl \
++  -l:libssl.so.0 \
+   -lusb-1.0 \
+   -lziparchive \
+   -lzstd \
+diff --git a/debian/system/adbd.mk b/debian/system/adbd.mk
+index 9d6abd7..73e49a4 100644
+--- a/debian/system/adbd.mk
++++ b/debian/system/adbd.mk
+@@ -81,23 +81,21 @@ CPPFLAGS += \
+   -Isystem/libbase/include \
+   -Isystem/logging/liblog/include \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN/../lib/android' \
+   -lbase \
+   -lbrotlidec \
+   -lbrotlienc \
+-  -lcrypto \
++  -l:libcrypto.so.0 \
+   -lcutils \
+   -llog \
+   -llz4 \
+   -lprotobuf \
+   -lresolv \
+-  -lssl \
+-  -lsystemd \
++  -l:libssl.so.0 \
+   -lzstd \
+   -pie \
+ 
+diff --git a/debian/system/extras/libext4_utils.mk b/debian/system/extras/libext4_utils.mk
+index 77455f4..5bfc950 100644
+--- a/debian/system/extras/libext4_utils.mk
++++ b/debian/system/extras/libext4_utils.mk
+@@ -26,8 +26,8 @@ CPPFLAGS += \
+   -D_LARGEFILE64_SOURCE \
+   -DFEC_NO_KLOG \
+   -DSQUASHFS_NO_KLOG \
+-  -I/usr/include/android \
+-  -I/usr/include/squashfuse \
++  -I$(SYSROOT)/usr/include/android \
++  -I$(SYSROOT)/usr/include/squashfuse \
+   -Isystem/core/libcutils/include \
+   -Isystem/core/libsparse/include \
+   -Isystem/extras/ext4_utils/include \
+diff --git a/debian/system/fastboot.mk b/debian/system/fastboot.mk
+index d68a99a..52f5d8b 100644
+--- a/debian/system/fastboot.mk
++++ b/debian/system/fastboot.mk
+@@ -56,16 +56,15 @@ CPPFLAGS += \
+   -Isystem/libziparchive/include \
+   -Isystem/tools/mkbootimg/include/bootimg \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -L/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -lbase \
+-  -lcrypto \
+-  -lcutils \
+-  -llog \
++  -Wl,-rpath='$$ORIGIN/../lib/android' \
++  debian/out/system/libbase.so.0 \
++  -l:libcrypto.so.0 \
++  debian/out/system/libcutils.so.0 \
++  debian/out/system/liblog.so.0 \
+   -lpthread \
+   -lprotobuf \
+   -lsparse \
+diff --git a/debian/system/libadb.mk b/debian/system/libadb.mk
+index 52f2838..ebd52aa 100644
+--- a/debian/system/libadb.mk
++++ b/debian/system/libadb.mk
+@@ -73,7 +73,6 @@ SOURCES_CC = $(filter %.cc,$(SOURCES))
+ OBJECTS_CC = $(SOURCES_CC:.cc=.o)
+ 
+ CXXFLAGS += \
+-  -Wexit-time-destructors \
+   -Wno-non-virtual-dtor \
+   -Wno-unused-parameter \
+   -Wno-missing-field-initializers \
+@@ -96,7 +95,7 @@ CPPFLAGS += \
+   -Isystem/core/libcutils/include \
+   -Isystem/libbase/include \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ debian/out/system/$(NAME).a: $(OBJECTS_CC) $(OBJECTS_CPP)
+        ar -rcs $@ $^
+diff --git a/debian/system/libbacktrace.mk b/debian/system/libbacktrace.mk
+index 0f798d4..f004061 100644
+--- a/debian/system/libbacktrace.mk
++++ b/debian/system/libbacktrace.mk
+@@ -1,4 +1,4 @@
+-include /usr/share/dpkg/architecture.mk
++DEB_HOST_MULTIARCH ?=
+ 
+ NAME = libbacktrace
+ 
+diff --git a/debian/system/libbase.mk b/debian/system/libbase.mk
+index f04d3f9..61f71c6 100644
+--- a/debian/system/libbase.mk
++++ b/debian/system/libbase.mk
+@@ -42,7 +42,7 @@ CPPFLAGS += \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN' \
+   -Wl,-soname,$(NAME).so.0 \
+   -llog \
+   -lpthread \
+diff --git a/debian/system/libcrypto_utils.mk b/debian/system/libcrypto_utils.mk
+index 39fd8a7..82ae46c 100644
+--- a/debian/system/libcrypto_utils.mk
++++ b/debian/system/libcrypto_utils.mk
+@@ -7,7 +7,7 @@ CPPFLAGS += \
+   -Isystem/core/include \
+   -Isystem/core/libcrypto_utils/include \
+   \
+-  -I/usr/include/android \
++  -I$(SYSROOT)/usr/include/android \
+ 
+ debian/out/system/$(NAME).a: $(OBJECTS)
+        ar -rcs $@ $^
+diff --git a/debian/system/libcutils.mk b/debian/system/libcutils.mk
+index 596ebd8..ff9e911 100644
+--- a/debian/system/libcutils.mk
++++ b/debian/system/libcutils.mk
+@@ -50,7 +50,7 @@ CPPFLAGS += \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN' \
+   -Wl,-soname,$(NAME).so.0 \
+   -lbase \
+   -llog \
+diff --git a/debian/system/liblog.mk b/debian/system/liblog.mk
+index b08a50c..091ccad 100644
+--- a/debian/system/liblog.mk
++++ b/debian/system/liblog.mk
+@@ -27,6 +27,7 @@ CPPFLAGS += \
+   -Isystem/logging/liblog/include \
+ 
+ LDFLAGS += \
++  -Wl,-rpath='$$ORIGIN' \
+   -Wl,-soname,$(NAME).so.0 \
+   -lpthread \
+   -shared
+diff --git a/debian/system/libutils.mk b/debian/system/libutils.mk
+index 6218c73..c7948e7 100644
+--- a/debian/system/libutils.mk
++++ b/debian/system/libutils.mk
+@@ -1,4 +1,3 @@
+-include /usr/share/dpkg/architecture.mk
+ 
+ NAME = libutils
+ 
+@@ -42,7 +41,7 @@ CPPFLAGS += \
+ 
+ LDFLAGS += \
+   -Ldebian/out/system \
+-  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
++  -Wl,-rpath='$$ORIGIN' \
+   -Wl,-soname,$(NAME).so.0 \
+   -lbacktrace \
+   -lcutils \
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0003-gcc-nullability-and-thread-annotation-compat.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0003-gcc-nullability-and-thread-annotation-compat.patch
new file mode 100644
index 0000000000..c3cf572ebd
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0003-gcc-nullability-and-thread-annotation-compat.patch
@@ -0,0 +1,34 @@
+From 793ad99196c5b9cf2922689d993b8f798e87174c Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Sun, 10 May 2026 12:00:00 +0200
+Subject: [PATCH] GCC nullability and thread annotation compat
+
+GCC does not understand the Clang-only nullability markers used in adb,
+and it rejects function-definition attributes emitted by the thread
+annotation macros. The nullability markers are injected from the Yocto
+recipe flags, while thread annotation attributes are made Clang-only so
+the sources parse under Yocto's GCC toolchain.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ system/libbase/include/android-base/thread_annotations.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/system/libbase/include/android-base/thread_annotations.h b/system/libbase/include/android-base/thread_annotations.h
+index 53fe6da..5523521 100644
+--- a/system/libbase/include/android-base/thread_annotations.h
++++ b/system/libbase/include/android-base/thread_annotations.h
+@@ -18,7 +18,11 @@
+ 
+ #include <mutex>
+ 
++#if defined(__clang__)
+ #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
++#else
++#define THREAD_ANNOTATION_ATTRIBUTE__(x)
++#endif
+ 
+ #define CAPABILITY(x) \
+       THREAD_ANNOTATION_ATTRIBUTE__(capability(x))
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0004-fastboot-super_flash_helper-include-climits.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0004-fastboot-super_flash_helper-include-climits.patch
new file mode 100644
index 0000000000..2b155e6a71
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0004-fastboot-super_flash_helper-include-climits.patch
@@ -0,0 +1,41 @@
+From fe7c2aa9a9032d11cb14ff7ab2a1a000237edaa3 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Tue, 26 May 2026 17:41:00 +0200
+Subject: [PATCH] adb: include <climits> for missing integer constants
+
+GCC rejects builds where IOV_MAX (sysdeps/uio.h) or UINT_MAX
+(super_flash_helper.cpp) are used without the header that defines them.
+Add #include <climits> in both files.
+
+Upstream-Status: Inappropriate [OE-specific sysroot compat]
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ packages/modules/adb/sysdeps/uio.h          | 1 +
+ system/core/fastboot/super_flash_helper.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/packages/modules/adb/sysdeps/uio.h b/packages/modules/adb/sysdeps/uio.h
+index f3ace64..163b4a8 100644
+--- a/packages/modules/adb/sysdeps/uio.h
++++ b/packages/modules/adb/sysdeps/uio.h
+@@ -35,6 +35,7 @@ ssize_t adb_writev(borrowed_fd fd, const adb_iovec* iov, int iovcnt);
+ #else
+ 
+ #include <sys/uio.h>
++#include <climits>
+ using adb_iovec = struct iovec;
+ inline ssize_t adb_writev(borrowed_fd fd, const adb_iovec* iov, int iovcnt) {
+     return writev(fd.get(), iov, std::min(iovcnt, IOV_MAX));
+diff --git a/system/core/fastboot/super_flash_helper.cpp b/system/core/fastboot/super_flash_helper.cpp
+index b617ce8..8c1edde 100644
+--- a/system/core/fastboot/super_flash_helper.cpp
++++ b/system/core/fastboot/super_flash_helper.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include "super_flash_helper.h"
+ 
++#include <climits>
+ #include <android-base/logging.h>
+ 
+ #include "util.h"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0005-adb-host-usb-compat.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0005-adb-host-usb-compat.patch
new file mode 100644
index 0000000000..6f396b7e9d
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0005-adb-host-usb-compat.patch
@@ -0,0 +1,34 @@
+From da0746f90c80bb5621d01f35d505412cd26898e2 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Thu, 21 May 2026 14:10:00 +0200
+Subject: [PATCH] adb: replace socket_get_local_port with inline getsockname
+
+The libcutils socket_get_local_port helper is not available in the native
+libcutils build. Replace the call with an inline getsockname implementation.
+
+Upstream-Status: Inappropriate [OE-specific]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ packages/modules/adb/sysdeps.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/packages/modules/adb/sysdeps.h b/packages/modules/adb/sysdeps.h
+index 99f6b74..9a99295 100644
+--- a/packages/modules/adb/sysdeps.h
++++ b/packages/modules/adb/sysdeps.h
+@@ -626,7 +626,13 @@ inline int adb_getsockname(borrowed_fd fd, struct sockaddr* sockaddr, socklen_t*
+ }
+ 
+ inline int adb_socket_get_local_port(borrowed_fd fd) {
+-    return socket_get_local_port(fd.get());
++    sockaddr_storage addr;
++    socklen_t addr_size = sizeof(addr);
++
++    if (getsockname(fd.get(), reinterpret_cast<sockaddr*>(&addr), &addr_size) == 0) {
++        return ntohs(reinterpret_cast<sockaddr_in*>(&addr)->sin_port);
++    }
++    return -1;
+ }
+ 
+ // Operate on a file descriptor returned from unix_open() or a well-known file
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0006-adbd-enable-root-and-remount-support.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0006-adbd-enable-root-and-remount-support.patch
new file mode 100644
index 0000000000..700e64f06d
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0006-adbd-enable-root-and-remount-support.patch
@@ -0,0 +1,466 @@
+From d247444cf5ef0c8ee2fcf207febe09f5101c2215 Mon Sep 17 00:00:00 2001
+From: Mihajlo Marinkovic <mmarinkovic@snap.com>
+Date: Fri, 29 May 2026 12:10:00 +0200
+Subject: [PATCH] adbd: enable root and remount support
+
+Enable root/unroot and remount support for the non-Android adbd build.
+
+Upstream-Status: Inappropriate [embedded Linux integration]
+
+Signed-off-by: Mihajlo Marinkovic <mmarinkovic@snap.com>
+---
+ debian/system/adbd.mk                         |  3 +
+ .../modules/adb/daemon/framebuffer_service.h  |  2 +-
+ packages/modules/adb/daemon/main.cpp          | 93 +++++++++++++++----
+ .../modules/adb/daemon/restart_service.cpp    | 40 +++++++-
+ packages/modules/adb/daemon/restart_service.h |  2 +-
+ packages/modules/adb/daemon/services.cpp      | 81 ++++++++++++++--
+ packages/modules/adb/sockets.cpp              | 20 +++-
+ packages/modules/adb/transport.cpp            |  1 -
+ 8 files changed, 204 insertions(+), 38 deletions(-)
+
+diff --git a/debian/system/adbd.mk b/debian/system/adbd.mk
+index 73e49a4..beb412e 100644
+--- a/debian/system/adbd.mk
++++ b/debian/system/adbd.mk
+@@ -17,6 +17,8 @@ ADBD_SRC_FILES = \
+   daemon/jdwp_service.cpp \
+   daemon/logging.cpp \
+   daemon/main.cpp \
++  daemon/framebuffer_service.cpp \
++  daemon/restart_service.cpp \
+   daemon/transport_local.cpp \
+   daemon/usb.cpp \
+   daemon/usb_ffs.cpp \
+@@ -64,6 +66,7 @@ CPPFLAGS += \
+   -DPLATFORM_TOOLS_VERSION='"$(PLATFORM_TOOLS_VERSION)"' \
+   -DADB_HOST=0 \
+   -DADB_VERSION='"$(DEB_VERSION)"' \
++  -DALLOW_ADBD_ROOT=1 \
+   -DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION=1 \
+   -DPAGE_SIZE=4096 \
+   -Iframeworks/native/libs/adbd_auth/include/ \
+diff --git a/packages/modules/adb/daemon/framebuffer_service.h b/packages/modules/adb/daemon/framebuffer_service.h
+index bab44be..0a8c822 100644
+--- a/packages/modules/adb/daemon/framebuffer_service.h
++++ b/packages/modules/adb/daemon/framebuffer_service.h
+@@ -18,6 +18,6 @@
+ 
+ #include "adb_unique_fd.h"
+ 
+-#if defined(__ANDROID__)
++#if !defined(__ANDROID_RECOVERY__)
+ void framebuffer_service(unique_fd fd);
+ #endif
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index 83905d3..f177abf 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -19,11 +19,15 @@
+ #include "sysdeps.h"
+ 
+ #include <errno.h>
++#include <fcntl.h>
+ #include <getopt.h>
++#include <grp.h>
+ #include <malloc.h>
++#include <pwd.h>
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <sys/capability.h>
+ #include <sys/prctl.h>
+ 
+@@ -61,6 +65,13 @@
+ #include "daemon/mdns.h"
+ #include "daemon/watchdog.h"
+ 
++namespace {
++constexpr char kAdbRootStatePath[] = "/run/.adb.root";
++constexpr char kRootMagic[] = "#ROOT#";
++constexpr char kNoRootMagic[] = "#NOROOT#";
++constexpr size_t kRootMagicSize = sizeof(kRootMagic) - 1;
++}
++
+ #if defined(__ANDROID__)
+ static const char* root_seclabel = nullptr;
+ 
+@@ -75,24 +86,16 @@ static bool should_drop_privileges() {
+     //
+     // ro.secure:
+     //   Drop privileges by default. Set to 1 on userdebug and user builds.
+-    bool ro_secure = android::base::GetBoolProperty("ro.secure", true);
+-    bool ro_debuggable = __android_log_is_debuggable();
+-
+-    // Drop privileges if ro.secure is set...
+-    bool drop = ro_secure;
+-
+-    // ... except "adb root" lets you keep privileges in a debuggable build.
+-    std::string prop = android::base::GetProperty("service.adb.root", "");
+-    bool adb_root = (prop == "1");
+-    bool adb_unroot = (prop == "0");
+-    if (ro_debuggable && adb_root) {
+-        drop = false;
++    int f = unix_open(kAdbRootStatePath, O_RDONLY | O_CLOEXEC);
++    if (f < 0) {
++        return true;
+     }
+-    // ... and "adb unroot" lets you explicitly drop privileges.
+-    if (adb_unroot) {
+-        drop = true;
++    char buf[kRootMagicSize];
++    bool drop = true;
++    if (unix_read(f, buf, sizeof(buf)) != -1 && !strncmp(buf, kRootMagic, kRootMagicSize)) {
++        drop = false;
+     }
+-
++    unix_close(f);
+     return drop;
+ }
+ 
+@@ -122,6 +125,17 @@ static void drop_privileges(int server_port) {
+     // Don't listen on a port (default 5037) if running in secure mode.
+     // Don't run as root if running in secure mode.
+     if (should_drop_privileges()) {
++        int f = unix_open(kAdbRootStatePath, O_WRONLY | O_CREAT | O_CLOEXEC, 0666);
++        if (f >= 0) {
++            if (fchmod(f, 0666) == -1) {
++                PLOG(ERROR) << "failed to set root state permissions";
++            }
++            if (unix_write(f, kNoRootMagic, sizeof(kNoRootMagic) - 1) == -1) {
++                PLOG(ERROR) << "failed to initialize root state";
++            }
++            unix_close(f);
++        }
++
+         const bool should_drop_caps = !__android_log_is_debuggable();
+ 
+         if (should_drop_caps) {
+@@ -182,6 +196,51 @@ static void drop_privileges(int server_port) {
+ }
+ #endif
+ 
++#if !defined(__ANDROID__)
++static bool should_drop_privileges() {
++    int f = unix_open(kAdbRootStatePath, O_RDONLY | O_CLOEXEC);
++    if (f < 0) {
++        return true;
++    }
++    char buf[kRootMagicSize];
++    bool drop = true;
++    if (unix_read(f, buf, sizeof(buf)) != -1 && !strncmp(buf, kRootMagic, kRootMagicSize)) {
++        drop = false;
++    }
++    unix_close(f);
++    return drop;
++}
++
++static void drop_privileges(int) {
++    if (!should_drop_privileges()) {
++        return;
++    }
++    int f = unix_open(kAdbRootStatePath, O_WRONLY | O_CREAT | O_CLOEXEC, 0666);
++    if (f >= 0) {
++        if (fchmod(f, 0666) == -1) {
++            PLOG(ERROR) << "failed to set root state permissions";
++        }
++        if (unix_write(f, kNoRootMagic, sizeof(kNoRootMagic) - 1) == -1) {
++            PLOG(ERROR) << "failed to initialize root state";
++        }
++        unix_close(f);
++    }
++    passwd* adb_user = getpwnam("adb");
++    if (adb_user == nullptr) {
++        PLOG(FATAL) << "getpwnam(adb) failed";
++    }
++    if (initgroups(adb_user->pw_name, adb_user->pw_gid) != 0) {
++        PLOG(FATAL) << "initgroups(adb) failed";
++    }
++    if (setgid(adb_user->pw_gid) != 0) {
++        PLOG(FATAL) << "setgid(adb) failed";
++    }
++    if (setuid(adb_user->pw_uid) != 0) {
++        PLOG(FATAL) << "setuid(adb) failed";
++    }
++}
++#endif
++
+ static void setup_adb(const std::vector<std::string>& addrs) {
+ #if defined(__ANDROID__)
+     // Get the first valid port from addrs and setup mDNS.
+@@ -242,9 +301,7 @@ int adbd_main(int server_port) {
+           " unchanged.\n");
+     }
+ 
+-#if defined(__ANDROID__)
+     drop_privileges(server_port);
+-#endif
+ 
+ #if defined(__ANDROID__)
+     // A thread gets spawned as a side-effect of initializing the watchdog, so it needs to happen
+diff --git a/packages/modules/adb/daemon/restart_service.cpp b/packages/modules/adb/daemon/restart_service.cpp
+index 16d2627..fcba9c8 100644
+--- a/packages/modules/adb/daemon/restart_service.cpp
++++ b/packages/modules/adb/daemon/restart_service.cpp
+@@ -18,6 +18,9 @@
+ 
+ #include "sysdeps.h"
+ 
++#include <errno.h>
++#include <fcntl.h>
++#include <string.h>
+ #include <unistd.h>
+ 
+ #include <android-base/logging.h>
+@@ -28,6 +31,26 @@
+ #include "adb_io.h"
+ #include "adb_unique_fd.h"
+ 
++namespace {
++constexpr char kAdbRootStatePath[] = "/run/.adb.root";
++constexpr char kRootMagic[] = "#ROOT#";
++constexpr char kNoRootMagic[] = "#NOROOT#";
++constexpr size_t kRootMagicSize = sizeof(kRootMagic) - 1;
++
++bool write_root_state(const char* value, size_t size) {
++    int f = unix_open(kAdbRootStatePath, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0666);
++    if (f < 0) {
++        return false;
++    }
++    bool ok = unix_write(f, value, size) == static_cast<int>(size);
++    if (ok) {
++        ok = fsync(f) == 0;
++    }
++    unix_close(f);
++    return ok;
++}
++}
++
+ void restart_root_service(unique_fd fd) {
+     if (getuid() == 0) {
+         WriteFdExactly(fd.get(), "adbd is already running as root\n");
+@@ -38,9 +61,15 @@ void restart_root_service(unique_fd fd) {
+         return;
+     }
+ 
+-    LOG(INFO) << "adbd restarting as root";
+-    android::base::SetProperty("service.adb.root", "1");
+-    WriteFdExactly(fd.get(), "restarting adbd as root\n");
++    for (int retry = 5; retry-- > 0;) {
++        if (write_root_state(kRootMagic, kRootMagicSize)) {
++            LOG(INFO) << "adbd restarting as root";
++            WriteFdExactly(fd.get(), "restarting adbd as root\n");
++            return;
++        }
++        usleep(100000);
++    }
++    WriteFdExactly(fd.get(), "failed to switch adbd to root\n");
+ }
+ 
+ void restart_unroot_service(unique_fd fd) {
+@@ -49,8 +78,11 @@ void restart_unroot_service(unique_fd fd) {
+         return;
+     }
+ 
++    if (!write_root_state(kNoRootMagic, sizeof(kNoRootMagic) - 1)) {
++        PLOG(ERROR) << "failed to write root state";
++        return;
++    }
+     LOG(INFO) << "adbd restarting as nonroot";
+-    android::base::SetProperty("service.adb.root", "0");
+     WriteFdExactly(fd.get(), "restarting adbd as non root\n");
+ }
+ 
+diff --git a/packages/modules/adb/daemon/restart_service.h b/packages/modules/adb/daemon/restart_service.h
+index 19840bd..2d239db 100644
+--- a/packages/modules/adb/daemon/restart_service.h
++++ b/packages/modules/adb/daemon/restart_service.h
+@@ -18,7 +18,7 @@
+ 
+ #include "adb_unique_fd.h"
+ 
+-#if defined(__ANDROID__)
++#if !defined(__ANDROID_RECOVERY__)
+ void restart_root_service(unique_fd fd);
+ void restart_unroot_service(unique_fd fd);
+ void restart_tcp_service(unique_fd fd, int port);
+diff --git a/packages/modules/adb/daemon/services.cpp b/packages/modules/adb/daemon/services.cpp
+index 5090441..1b27314 100644
+--- a/packages/modules/adb/daemon/services.cpp
++++ b/packages/modules/adb/daemon/services.cpp
+@@ -19,12 +19,18 @@
+ #include "sysdeps.h"
+ 
+ #include <errno.h>
++#include <fcntl.h>
++#include <linux/fs.h>
++#include <linux/reboot.h>
++#include <mntent.h>
+ #include <netdb.h>
+ #include <netinet/in.h>
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/mount.h>
++#include <sys/syscall.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+@@ -40,7 +46,6 @@
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
+ #include <android-base/unique_fd.h>
+-#include <cutils/android_reboot.h>
+ #include <cutils/sockets.h>
+ #include <log/log_properties.h>
+ 
+@@ -143,6 +148,60 @@ static void spin_service(unique_fd fd) {
+     WriteFdExactly(fd.get(), "spinning\n");
+ }
+ 
++static std::string find_mount(std::string_view dir) {
++    std::unique_ptr<FILE, int (*)(FILE*)> fp(setmntent("/proc/mounts", "r"), endmntent);
++    if (!fp) {
++        return {};
++    }
++    while (mntent* entry = getmntent(fp.get())) {
++        if (dir == entry->mnt_dir) {
++            return entry->mnt_fsname;
++        }
++    }
++    return {};
++}
++
++static bool make_block_device_writable(const std::string& dev) {
++    android::base::unique_fd fd(unix_open(dev.c_str(), O_RDONLY | O_CLOEXEC));
++    if (fd == -1) {
++        return false;
++    }
++    int off = 0;
++    return ioctl(fd.get(), BLKROSET, &off) != -1;
++}
++
++static bool remount_partition(unique_fd& fd, std::string_view dir) {
++    std::string mount_point(dir);
++    if (!directory_exists(mount_point)) {
++        return true;
++    }
++    std::string dev = find_mount(dir);
++    if (dev.empty()) {
++        WriteFdFmt(fd.get(), "remount of %.*s failed; mount not found\n",
++                   static_cast<int>(dir.size()), dir.data());
++        return false;
++    }
++    if (!make_block_device_writable(dev)) {
++        WriteFdFmt(fd.get(), "remount of %.*s failed; couldn't make block device %s writable: %s\n",
++                   static_cast<int>(dir.size()), dir.data(), dev.c_str(), strerror(errno));
++        return false;
++    }
++    if (mount(dev.c_str(), mount_point.c_str(), "none", MS_REMOUNT, nullptr) == -1) {
++        WriteFdFmt(fd.get(), "remount of %.*s failed: %s\n", static_cast<int>(dir.size()), dir.data(), strerror(errno));
++        return false;
++    }
++    return true;
++}
++
++static void remount_service(unique_fd fd) {
++    if (getuid() != 0) {
++        WriteFdExactly(fd.get(), "Not running as root. Try \"adb root\" first.\n");
++        return;
++    }
++    bool success = remount_partition(fd, "/");
++    WriteFdExactly(fd.get(), success ? "remount succeeded\n" : "remount failed\n");
++}
++
+ [[maybe_unused]] static unique_fd reboot_device(const std::string& name) {
+ #if defined(__ANDROID_RECOVERY__)
+     if (!__android_log_is_debuggable()) {
+@@ -157,10 +216,16 @@ static void spin_service(unique_fd fd) {
+         return create_service_thread("reboot", reboot_service);
+     }
+ #endif
+-    // Fall through
+-    std::string cmd = "/system/bin/reboot ";
+-    cmd += name;
+-    return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);
++    auto reboot_service = [name](unique_fd fd) {
++        sync();
++        if (syscall(SYS_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2,
++                    LINUX_REBOOT_CMD_RESTART2, "adb") != 0) {
++            WriteFdFmt(fd.get(), "reboot (%s) failed: %s\n", name.c_str(), strerror(errno));
++            return;
++        }
++        while (true) pause();
++    };
++    return create_service_thread("reboot", reboot_service);
+ }
+ 
+ struct ServiceSocket : public asocket {
+@@ -281,13 +346,11 @@ unique_fd daemon_service_to_fd(std::string_view name, atransport* transport) {
+     }
+ #endif
+ 
+-#if defined(__ANDROID__)
++#if !defined(__ANDROID_RECOVERY__)
+     if (name.starts_with("framebuffer:")) {
+         return create_service_thread("fb", framebuffer_service);
+     } else if (android::base::ConsumePrefix(&name, "remount:")) {
+-        std::string cmd = "/system/bin/remount ";
+-        cmd += name;
+-        return StartSubprocess(cmd, nullptr, SubprocessType::kRaw, SubprocessProtocol::kNone);
++        return create_service_thread("remount", remount_service);
+     } else if (android::base::ConsumePrefix(&name, "reboot:")) {
+         return reboot_device(std::string(name));
+     } else if (name.starts_with("root:")) {
+diff --git a/packages/modules/adb/sockets.cpp b/packages/modules/adb/sockets.cpp
+index f766f7e..8aa1e2b 100644
+--- a/packages/modules/adb/sockets.cpp
++++ b/packages/modules/adb/sockets.cpp
+@@ -337,7 +337,7 @@ static void local_socket_destroy(asocket* s) {
+ 
+     if (exit_on_close) {
+         D("local_socket_destroy: exiting");
+-        exit(0);
++        exit(exit_on_close - 1);
+     }
+ }
+ 
+@@ -473,9 +473,21 @@ asocket* create_local_service_socket(std::string_view name, atransport* transpor
+     LOG(VERBOSE) << "LS(" << s->id << "): bound to '" << name << "' via " << fd_value;
+ 
+ #if !ADB_HOST
+-    if ((name.starts_with("root:") && getuid() != 0 && __android_log_is_debuggable()) ||
+-        (name.starts_with("unroot:") && getuid() == 0) || name.starts_with("usb:") ||
+-        name.starts_with("tcpip:")) {
++    bool exit_on_close = false;
++#if defined(__ANDROID__)
++    exit_on_close = (name.starts_with("root:") && getuid() != 0 &&
++                     __android_log_is_debuggable()) ||
++                    (name.starts_with("unroot:") && getuid() == 0);
++#else
++    exit_on_close = (name.starts_with("root:") && getuid() != 0) ||
++                    (name.starts_with("unroot:") && getuid() == 0);
++#endif
++    // exit_on_close == 2: exit(1) — triggers Restart=on-failure (root/unroot)
++    // exit_on_close == 1: exit(0) — clean exit (usb/tcpip)
++    if (exit_on_close) {
++        D("LS(%d): enabling exit_on_close", s->id);
++        s->exit_on_close = 2;
++    } else if (name.starts_with("usb:") || name.starts_with("tcpip:")) {
+         D("LS(%d): enabling exit_on_close", s->id);
+         s->exit_on_close = 1;
+     }
+diff --git a/packages/modules/adb/transport.cpp b/packages/modules/adb/transport.cpp
+index b99e8bc..b89f495 100644
+--- a/packages/modules/adb/transport.cpp
++++ b/packages/modules/adb/transport.cpp
+@@ -1200,7 +1200,6 @@ const FeatureSet& supported_features() {
+             kFeatureAbb,
+             kFeatureFixedPushSymlinkTimestamp,
+             kFeatureAbbExec,
+-            kFeatureRemountShell,
+             kFeatureTrackApp,
+             kFeatureSendRecv2,
+             kFeatureSendRecv2Brotli,
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0007-libcutils-guard-Android-private-header-with-addition.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0007-libcutils-guard-Android-private-header-with-addition.patch
new file mode 100644
index 0000000000..aa5ffc2825
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0007-libcutils-guard-Android-private-header-with-addition.patch
@@ -0,0 +1,36 @@
+From 35e41ab351e03abcd2709f136c57df7bc4855532 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Wed, 10 Jun 2026 00:00:00 +0000
+Subject: [PATCH] libcutils: guard Android-private header with additional
+ __has_include check
+
+The properties.cpp file uses __has_include(<sys/system_properties.h>) to
+conditionally compile the Android bionic property system implementation.
+However, some Linux host environments (e.g. those with Android SDK headers
+installed in /usr/local/include) have sys/system_properties.h without the
+accompanying private header sys/_system_properties.h.
+
+Guard both the public and private header inclusion to prevent a fatal error
+on such hosts.
+
+Upstream-Status: Inappropriate [OE-specific, guards against host header contamination]
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ system/core/libcutils/properties.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/system/core/libcutils/properties.cpp b/system/core/libcutils/properties.cpp
+index 03f0496..fd0f6c3 100644
+--- a/system/core/libcutils/properties.cpp
++++ b/system/core/libcutils/properties.cpp
+@@ -91,7 +91,8 @@ int property_get(const char* key, char* value, const char* default_value) {
+     return len;
+ }
+ 
+-#if __has_include(<sys/system_properties.h>)
++#if __has_include(<sys/system_properties.h>) && \
++    __has_include(<sys/_system_properties.h>)
+ 
+ #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
+ #include <sys/_system_properties.h>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0008-adb-GCC-compatibility-fixes-for-usb_linux-and-sysdep.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0008-adb-GCC-compatibility-fixes-for-usb_linux-and-sysdep.patch
new file mode 100644
index 0000000000..ae7de97e49
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0008-adb-GCC-compatibility-fixes-for-usb_linux-and-sysdep.patch
@@ -0,0 +1,197 @@
+From 67a400310c07fad8f9ecc0058203942237ab6325 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Wed, 10 Jun 2026 00:00:00 +0000
+Subject: [PATCH] adb: GCC compatibility fixes for usb_linux, sysdeps, and adbd
+
+GCC-specific issues when building adb/adbd with GCC instead of Clang:
+
+1. usb_linux.cpp embeds usbdevfs_urb (which ends in a flexible array member
+   iso_frame_desc[]) in a non-last position inside struct usb_handle. GCC
+   rejects this as a hard error. Introduce usbdevfs_urb_bulk, a copy of the
+   struct without the FAM, for use in embedding contexts.
+
+2. sysdeps.h uses #define write/pwrite to redirect callers to adb_write/
+   adb_pwrite. GCC's newer abseil in the native sysroot calls ostream::write()
+   which gets incorrectly macro-expanded. Replace the #define redirects with
+   #pragma GCC poison.
+
+3. adbd.mk links -lprotobuf but with protobuf 6.x the abseil log helpers are
+   no longer pulled in transitively. Add -labsl_log_internal_message and
+   -labsl_log_internal_check_op explicitly.
+
+Upstream-Status: Inappropriate [OE-specific, GCC compat]
+
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ debian/system/adb.mk                      |  2 ++
+ debian/system/adbd.mk                     |  2 ++
+ packages/modules/adb/client/usb_linux.cpp | 44 ++++++++++++++++-------
+ packages/modules/adb/sysdeps.h            | 11 ++----
+ 4 files changed, 37 insertions(+), 22 deletions(-)
+
+diff --git a/debian/system/adb.mk b/debian/system/adb.mk
+index 90a816f..6c9b4ce 100644
+--- a/debian/system/adb.mk
++++ b/debian/system/adb.mk
+@@ -95,6 +95,8 @@ LDFLAGS += \
+   -llog \
+   -llz4 \
+   -lprotobuf \
++  -labsl_log_internal_message \
++  -labsl_log_internal_check_op \
+   -lpthread \
+   -l:libssl.so.0 \
+   -lusb-1.0 \
+diff --git a/debian/system/adbd.mk b/debian/system/adbd.mk
+index beb412e..e755f20 100644
+--- a/debian/system/adbd.mk
++++ b/debian/system/adbd.mk
+@@ -97,6 +97,8 @@ LDFLAGS += \
+   -llog \
+   -llz4 \
+   -lprotobuf \
++  -labsl_log_internal_message \
++  -labsl_log_internal_check_op \
+   -lresolv \
+   -l:libssl.so.0 \
+   -lzstd \
+diff --git a/packages/modules/adb/client/usb_linux.cpp b/packages/modules/adb/client/usb_linux.cpp
+index 96d7a8a..ecc1035 100644
+--- a/packages/modules/adb/client/usb_linux.cpp
++++ b/packages/modules/adb/client/usb_linux.cpp
+@@ -57,6 +57,27 @@ using namespace std::literals;
+ /* usb scan debugging is waaaay too verbose */
+ #define DBGX(x...)
+ 
++// usbdevfs_urb embeds a flexible array member iso_frame_desc[]. Embedding this
++// struct in another struct in a non-last position is a hard GCC error. Since
++// ADB only uses bulk endpoints (never ISO), define a wrapper type without the
++// FAM to use for struct embedding.
++struct usbdevfs_urb_bulk {
++    unsigned char type;
++    unsigned char endpoint;
++    int status;
++    unsigned int flags;
++    void* buffer;
++    int buffer_length;
++    int actual_length;
++    int start_frame;
++    union { int number_of_packets; unsigned int stream_id; };
++    int error_count;
++    unsigned int signr;
++    void* usercontext;
++};
++static_assert(sizeof(usbdevfs_urb_bulk) == sizeof(usbdevfs_urb),
++              "usbdevfs_urb_bulk size mismatch");
++
+ struct usb_handle {
+     ~usb_handle() {
+         if (fd != -1) unix_close(fd);
+@@ -74,11 +95,8 @@ struct usb_handle {
+     // The usbdevfs_urb structure ends in a variable length array of
+     // usbdevfs_iso_packet_desc. Since none of the usb calls ever attempt
+     // to fill in those values, ignore this warning.
+-#pragma clang diagnostic push
+-#pragma clang diagnostic ignored "-Wgnu-variable-sized-type-not-at-end"
+-    usbdevfs_urb urb_in;
+-    usbdevfs_urb urb_out;
+-#pragma clang diagnostic pop
++    usbdevfs_urb_bulk urb_in;
++    usbdevfs_urb_bulk urb_out;
+ 
+     bool urb_in_busy = false;
+     bool urb_out_busy = false;
+@@ -316,7 +334,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
+     std::unique_lock<std::mutex> lock(h->mutex);
+     D("++ usb_bulk_write ++");
+ 
+-    usbdevfs_urb* urb = &h->urb_out;
++    usbdevfs_urb_bulk* urb = &h->urb_out;
+     memset(urb, 0, sizeof(*urb));
+     urb->type = USBDEVFS_URB_TYPE_BULK;
+     urb->endpoint = h->ep_out;
+@@ -329,7 +347,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) {
+         return -1;
+     }
+ 
+-    if (TEMP_FAILURE_RETRY(ioctl(h->fd, USBDEVFS_SUBMITURB, urb)) == -1) {
++    if (TEMP_FAILURE_RETRY(ioctl(h->fd, USBDEVFS_SUBMITURB, reinterpret_cast<usbdevfs_urb*>(urb))) == -1) {
+         return -1;
+     }
+ 
+@@ -355,7 +373,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+     std::unique_lock<std::mutex> lock(h->mutex);
+     D("++ usb_bulk_read ++");
+ 
+-    usbdevfs_urb* urb = &h->urb_in;
++    usbdevfs_urb_bulk* urb = &h->urb_in;
+     memset(urb, 0, sizeof(*urb));
+     urb->type = USBDEVFS_URB_TYPE_BULK;
+     urb->endpoint = h->ep_in;
+@@ -368,7 +386,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+         return -1;
+     }
+ 
+-    if (TEMP_FAILURE_RETRY(ioctl(h->fd, USBDEVFS_SUBMITURB, urb)) == -1) {
++    if (TEMP_FAILURE_RETRY(ioctl(h->fd, USBDEVFS_SUBMITURB, reinterpret_cast<usbdevfs_urb*>(urb))) == -1) {
+         return -1;
+     }
+ 
+@@ -400,7 +418,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+         }
+         D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length);
+ 
+-        if (out == &h->urb_in) {
++        if (out == reinterpret_cast<usbdevfs_urb*>(&h->urb_in)) {
+             D("[ reap urb - IN complete ]");
+             h->urb_in_busy = false;
+             if (urb->status != 0) {
+@@ -409,7 +427,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) {
+             }
+             return urb->actual_length;
+         }
+-        if (out == &h->urb_out) {
++        if (out == reinterpret_cast<usbdevfs_urb*>(&h->urb_out)) {
+             D("[ reap urb - OUT compelete ]");
+             h->urb_out_busy = false;
+             h->cv.notify_all();
+@@ -513,8 +531,8 @@ void usb_kick(usb_handle* h) {
+             ** but this ensures that a reader blocked on REAPURB
+             ** will get unblocked
+             */
+-            ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in);
+-            ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out);
++            ioctl(h->fd, USBDEVFS_DISCARDURB, reinterpret_cast<usbdevfs_urb*>(&h->urb_in));
++            ioctl(h->fd, USBDEVFS_DISCARDURB, reinterpret_cast<usbdevfs_urb*>(&h->urb_out));
+             h->urb_in.status = -ENODEV;
+             h->urb_out.status = -ENODEV;
+             h->urb_in_busy = false;
+diff --git a/packages/modules/adb/sysdeps.h b/packages/modules/adb/sysdeps.h
+index 9a99295..b364a47 100644
+--- a/packages/modules/adb/sysdeps.h
++++ b/packages/modules/adb/sysdeps.h
+@@ -141,11 +141,7 @@ static inline int unix_read(borrowed_fd fd, void* buf, size_t len) {
+ static inline int unix_write(borrowed_fd fd, const void* buf, size_t len) {
+     return write(fd.get(), buf, len);
+ }
+-#undef   write
+-#define  write  ___xxx_write
+-
+-#undef pwrite
+-#define pwrite ___xxx_pwrite
++// (write and pwrite macros omitted: incompatible with GCC/abseil compat)
+ 
+ // See the comments for the !defined(_WIN32) version of unix_lseek().
+ static inline int unix_lseek(borrowed_fd fd, int pos, int where) {
+@@ -549,10 +545,7 @@ static inline int adb_pwrite(int fd, const void* buf, size_t len, off64_t offset
+ #endif
+ }
+ 
+-#undef   write
+-#define  write  ___xxx_write
+-#undef pwrite
+-#define pwrite ___xxx_pwrite
++// (write and pwrite macros omitted: incompatible with GCC/abseil compat)
+ 
+ static inline int64_t adb_lseek(borrowed_fd fd, int64_t pos, int where) {
+ #if defined(__APPLE__)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0009-libbase-include-stdint.h-in-hex.cpp.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0009-libbase-include-stdint.h-in-hex.cpp.patch
new file mode 100644
index 0000000000..179f97363f
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0009-libbase-include-stdint.h-in-hex.cpp.patch
@@ -0,0 +1,26 @@
+From 164b4261fd5abd851a432c7d56280b1b1adc7f2b Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Wed, 10 Jun 2026 00:00:00 +0000
+Subject: [PATCH] libbase: include stdint.h in hex.cpp
+
+hex.cpp uses uint8_t but neither the file nor its transitive headers
+always pull in <stdint.h> on every sysroot.  Add an explicit include.
+
+Upstream-Status: Inappropriate [OE-specific sysroot compat]
+Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
+---
+ system/libbase/hex.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/system/libbase/hex.cpp b/system/libbase/hex.cpp
+index a4b7715..857ff29 100644
+--- a/system/libbase/hex.cpp
++++ b/system/libbase/hex.cpp
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include "android-base/hex.h"
++#include <stdint.h>
+ 
+ #include "android-base/logging.h"
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/0010-adbd-make-systemd-sd_notify-conditional-on-HAVE_SYSTEMD.patch b/meta-oe/recipes-devtools/android-tools/android-tools/0010-adbd-make-systemd-sd_notify-conditional-on-HAVE_SYSTEMD.patch
new file mode 100644
index 0000000000..a8c16a41d4
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/0010-adbd-make-systemd-sd_notify-conditional-on-HAVE_SYSTEMD.patch
@@ -0,0 +1,54 @@
+From 8874be8b9a3906c5720d75320b176b51523b6c15 Mon Sep 17 00:00:00 2001
+From: Etienne Cordonnier <ecordonnier@snap.com>
+Date: Fri, 12 Jun 2026 15:54:47 +0200
+Subject: [PATCH] adbd: make systemd sd_notify conditional on HAVE_SYSTEMD
+
+Guard the sd-daemon.h include and sd_notify() call behind HAVE_SYSTEMD
+instead of __linux__, so the feature is opt-in via a recipe PACKAGECONFIG.
+Add a corresponding ifeq block in debian/system/adbd.mk to pass
+-DHAVE_SYSTEMD and -lsystemd only when the flag is set.
+
+Upstream-Status: Inappropriate [OE-specific]
+---
+ debian/system/adbd.mk                | 5 +++++
+ packages/modules/adb/daemon/main.cpp | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/debian/system/adbd.mk b/debian/system/adbd.mk
+index e755f20..a3f88f1 100644
+--- a/debian/system/adbd.mk
++++ b/debian/system/adbd.mk
+@@ -104,6 +104,11 @@ LDFLAGS += \
+   -lzstd \
+   -pie \
+ 
++ifeq ($(HAVE_SYSTEMD),1)
++LDFLAGS += -lsystemd
++CPPFLAGS += -DHAVE_SYSTEMD
++endif
++
+ STATIC_LIBS = \
+   debian/out/system/libadb.a \
+   debian/out/system/libcrypto_utils.a \
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index f177abf..789c25b 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -49,7 +49,7 @@
+ #include "selinux/android.h"
+ #endif
+ 
+-#if defined(__linux__)
++#if defined(HAVE_SYSTEMD)
+ #include <systemd/sd-daemon.h>
+ #endif
+ 
+@@ -365,7 +365,7 @@ int adbd_main(int server_port) {
+     init_jdwp();
+     D("adbd_main(): post init_jdwp()");
+ 
+-#if defined(__linux__)
++#if defined(HAVE_SYSTEMD)
+     sd_notify(1, "READY=1");
+ #endif
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk b/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk
deleted file mode 100644
index 0687c22c17..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# Makefile for adb
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/core/adb
-adb_SRC_FILES += adb.c
-adb_SRC_FILES += console.c
-adb_SRC_FILES += transport.c
-adb_SRC_FILES += transport_local.c
-adb_SRC_FILES += transport_usb.c
-adb_SRC_FILES += commandline.c
-adb_SRC_FILES += adb_client.c
-adb_SRC_FILES += adb_auth_host.c
-adb_SRC_FILES += sockets.c
-adb_SRC_FILES += services.c
-adb_SRC_FILES += file_sync_client.c
-adb_SRC_FILES += get_my_path_linux.c
-adb_SRC_FILES += usb_linux.c
-adb_SRC_FILES += usb_vendors.c
-adb_SRC_FILES += fdevent.c
-adb_OBJS := $(adb_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libcutils
-libcutils_SRC_FILES += atomic.c
-libcutils_SRC_FILES += hashmap.c
-libcutils_SRC_FILES += native_handle.c
-libcutils_SRC_FILES += config_utils.c
-libcutils_SRC_FILES += cpu_info.c
-libcutils_SRC_FILES += load_file.c
-# libcutils_SRC_FILES += open_memstream.c
-# libcutils_SRC_FILES += strdup16to8.c
-# libcutils_SRC_FILES += strdup8to16.c
-# libcutils_SRC_FILES += record_stream.c
-# libcutils_SRC_FILES += process_name.c
-# libcutils_SRC_FILES += threads.c
-# libcutils_SRC_FILES += sched_policy.c
-# libcutils_SRC_FILES += iosched_policy.c
-libcutils_SRC_FILES += str_parms.c
-libcutils_SRC_FILES += fs.c
-libcutils_SRC_FILES += multiuser.c
-libcutils_SRC_FILES += socket_inaddr_any_server.c
-libcutils_SRC_FILES += socket_local_client.c
-libcutils_SRC_FILES += socket_local_server.c
-libcutils_SRC_FILES += socket_loopback_client.c
-libcutils_SRC_FILES += socket_loopback_server.c
-libcutils_SRC_FILES += socket_network_client.c
-libcutils_SRC_FILES += sockets.c
-libcutils_SRC_FILES += ashmem-host.c
-libcutils_SRC_FILES += dlmalloc_stubs.c
-libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o)
-
-CFLAGS += -DANDROID
-CFLAGS += -DWORKAROUND_BUG6558362
-CFLAGS += -DADB_HOST=1
-CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
-CFLAGS += -DANDROID_SMP=0
-CFLAGS += -I$(SRCDIR)/system/core/adb
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-LIBS += libcutils.a -lpthread -lcrypto
-
-all: adb
-
-adb: libcutils.a $(adb_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(adb_OBJS) $(LIBS)
-
-libcutils.a: $(libcutils_OBJS)
-        $(AR) rcs $@ $(libcutils_OBJS)
-
-clean:
-        $(RM) $(adb_OBJS) $(libcutils_OBJS) adb *.a
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk b/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
deleted file mode 100644
index 31452ae104..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
+++ /dev/null
@@ -1,164 +0,0 @@
-# Makefile for adbd
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/core/adb
-adbd_SRC_FILES += adb.c
-adbd_SRC_FILES += fdevent.c
-adbd_SRC_FILES += transport.c
-adbd_SRC_FILES += transport_local.c
-adbd_SRC_FILES += transport_usb.c
-adbd_SRC_FILES += adb_auth_client.c
-adbd_SRC_FILES += sockets.c
-adbd_SRC_FILES += services.c
-adbd_SRC_FILES += file_sync_service.c
-adbd_SRC_FILES += jdwp_service.c
-adbd_SRC_FILES += framebuffer_service.c
-adbd_SRC_FILES += remount_service.c
-adbd_SRC_FILES += disable_verity_service.c
-adbd_SRC_FILES += base64.c
-adbd_SRC_FILES += usb_linux_client.c
-adbd_OBJS := $(adbd_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/liblog
-liblog_SRC_FILES += logd_write.c
-liblog_SRC_FILES += log_event_write.c
-liblog_SRC_FILES += logprint.c
-liblog_SRC_FILES += event_tag_map.c
-liblog_SRC_FILES += fake_log_device.c
-liblog_OBJS := $(liblog_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/fs_mgr
-fs_mgr_SRC_FILES += fs_mgr_fstab.c
-fs_mgr_OBJS := $(fs_mgr_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libcutils
-libcutils_SRC_FILES += atomic.c
-libcutils_SRC_FILES += hashmap.c
-libcutils_SRC_FILES += native_handle.c
-libcutils_SRC_FILES += config_utils.c
-libcutils_SRC_FILES += cpu_info.c
-libcutils_SRC_FILES += load_file.c
-# libcutils_SRC_FILES += open_memstream.c
-# libcutils_SRC_FILES += strdup16to8.c
-# libcutils_SRC_FILES += strdup8to16.c
-# libcutils_SRC_FILES += record_stream.c
-# libcutils_SRC_FILES += process_name.c
-# libcutils_SRC_FILES += threads.c
-# libcutils_SRC_FILES += sched_policy.c
-# libcutils_SRC_FILES += iosched_policy.c
-libcutils_SRC_FILES += str_parms.c
-libcutils_SRC_FILES += fs.c
-libcutils_SRC_FILES += multiuser.c
-libcutils_SRC_FILES += socket_inaddr_any_server.c
-libcutils_SRC_FILES += socket_local_client.c
-libcutils_SRC_FILES += socket_local_server.c
-libcutils_SRC_FILES += socket_loopback_client.c
-libcutils_SRC_FILES += socket_loopback_server.c
-libcutils_SRC_FILES += socket_network_client.c
-libcutils_SRC_FILES += sockets.c
-libcutils_SRC_FILES += ashmem-host.c
-libcutils_SRC_FILES += dlmalloc_stubs.c
-libcutils_SRC_FILES += klog.c
-libcutils_SRC_FILES += properties.c
-libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/external/libselinux/src
-libselinux_SRC_FILES += booleans.c
-libselinux_SRC_FILES += canonicalize_context.c
-libselinux_SRC_FILES += disable.c
-libselinux_SRC_FILES += enabled.c
-libselinux_SRC_FILES += fgetfilecon.c
-libselinux_SRC_FILES += fsetfilecon.c
-libselinux_SRC_FILES += getenforce.c
-libselinux_SRC_FILES += getfilecon.c
-libselinux_SRC_FILES += getpeercon.c
-libselinux_SRC_FILES += lgetfilecon.c
-libselinux_SRC_FILES += load_policy.c
-libselinux_SRC_FILES += lsetfilecon.c
-libselinux_SRC_FILES += policyvers.c
-libselinux_SRC_FILES += procattr.c
-libselinux_SRC_FILES += setenforce.c
-libselinux_SRC_FILES += setfilecon.c
-libselinux_SRC_FILES += context.c
-libselinux_SRC_FILES += mapping.c
-libselinux_SRC_FILES += stringrep.c
-libselinux_SRC_FILES += compute_create.c
-libselinux_SRC_FILES += compute_av.c
-libselinux_SRC_FILES += avc.c
-libselinux_SRC_FILES += avc_internal.c
-libselinux_SRC_FILES += avc_sidtab.c
-libselinux_SRC_FILES += get_initial_context.c
-libselinux_SRC_FILES += checkAccess.c
-libselinux_SRC_FILES += sestatus.c
-libselinux_SRC_FILES += deny_unknown.c
-
-libselinux_SRC_FILES += callbacks.c
-libselinux_SRC_FILES += check_context.c
-libselinux_SRC_FILES += freecon.c
-libselinux_SRC_FILES += init.c
-libselinux_SRC_FILES += label.c
-libselinux_SRC_FILES += label_file.c
-libselinux_SRC_FILES += label_android_property.c
-libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/extras/ext4_utils
-libext4_utils_SRC_FILES += make_ext4fs.c
-libext4_utils_SRC_FILES += ext4fixup.c
-libext4_utils_SRC_FILES += ext4_utils.c
-libext4_utils_SRC_FILES += allocate.c
-libext4_utils_SRC_FILES += contents.c
-libext4_utils_SRC_FILES += extent.c
-libext4_utils_SRC_FILES += indirect.c
-libext4_utils_SRC_FILES += uuid.c
-libext4_utils_SRC_FILES += sha1.c
-libext4_utils_SRC_FILES += wipe.c
-libext4_utils_SRC_FILES += crc16.c
-libext4_utils_SRC_FILES += ext4_sb.c
-libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o)
-
-CFLAGS += -std=gnu11
-CFLAGS += -DANDROID
-CFLAGS += -DADB_HOST=0
-CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
-CFLAGS += -DALLOW_ADBD_ROOT=1
-CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1
-CFLAGS += -DPROP_NAME_MAX=32
-CFLAGS += -DPROP_VALUE_MAX=92
-CFLAGS += -DAUDITD_LOG_TAG=1003
-# CFLAGS += -DHOST
-CFLAGS += -DANDROID_SMP=0
-CFLAGS += -I$(SRCDIR)/system/core/adb
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -I$(SRCDIR)/system/core/libsparse/include
-CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils
-CFLAGS += -I$(SRCDIR)/system/core/fs_mgr/include
-CFLAGS += -I$(SRCDIR)/hardware/libhardware/include
-CFLAGS += -I$(SRCDIR)/external/libselinux/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-LIBS += liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a -lpthread -lbsd -lpcre -lresolv -lcrypto
-
-all: adbd
-
-adbd: liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a $(adbd_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(adbd_OBJS) $(LIBS)
-
-liblog.a: $(liblog_OBJS)
-        $(AR) rcs $@ $(liblog_OBJS)
-
-libfs_mgr.a: $(fs_mgr_OBJS)
-        $(AR) rcs $@ $(fs_mgr_OBJS)
-
-libcutils.a: $(libcutils_OBJS)
-        $(AR) rcs $@ $(libcutils_OBJS)
-
-libselinux.a: $(libselinux_OBJS)
-        export CFLAGS="-DANDROID -DHOST"
-        $(AR) rcs $@ $(libselinux_OBJS)
-
-libext4_utils.a: $(libext4_utils_OBJS)
-        $(AR) rcs $@ $(libext4_utils_OBJS)
-
-clean:
-        $(RM) *.o *.a adbd
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
index b6661f2e39..7c16b5cea2 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
@@ -4,7 +4,7 @@ ConditionPathExists=/etc/usb-debugging-enabled
 Before=android-system.service
 
 [Service]
-Type=simple
+Type=notify
 Restart=on-failure
 ExecStartPre=-/usr/bin/android-gadget-setup adb
 ExecStart=/usr/bin/adbd
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch b/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch
deleted file mode 100644
index c091fd404b..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch
+++ /dev/null
@@ -1,361 +0,0 @@
-From 82dce13ea7b5b31c63851bd67f66072413917e73 Mon Sep 17 00:00:00 2001
-From: Chenxi Mao <maochenxi@eswin.com>
-Date: Mon, 20 Apr 2020 15:32:40 +0800
-Subject: [PATCH 1/1] Riscv: Add risc-v Android config header
-
----
-Upstream-Status: Pending
-
- .../arch/linux-riscv64/AndroidConfig.h        | 340 ++++++++++++++++++
- 1 file changed, 340 insertions(+)
- create mode 100644 core/combo/include/arch/linux-riscv64/AndroidConfig.h
-
-diff --git a/core/combo/include/arch/linux-riscv64/AndroidConfig.h b/core/combo/include/arch/linux-riscv64/AndroidConfig.h
-new file mode 100644
-index 0000000000..bcbda8f87f
---- /dev/null
-+++ b/core/combo/include/arch/linux-riscv64/AndroidConfig.h
-@@ -0,0 +1,340 @@
-+/*
-+ * Copyright (C) 2013 The Android Open Source Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+/*
-+ * Android config -- "android-aarch64".  Used for ARM aarch64 device builds.
-+ */
-+#ifndef _ANDROID_CONFIG_H
-+#define _ANDROID_CONFIG_H
-+
-+/*
-+ * ===========================================================================
-+ *                              !!! IMPORTANT !!!
-+ * ===========================================================================
-+ *
-+ * This file is included by ALL C/C++ source files.  Don't put anything in
-+ * here unless you are absolutely certain it can't go anywhere else.
-+ *
-+ * Any C++ stuff must be wrapped with "#ifdef __cplusplus".  Do not use "//"
-+ * comments.
-+ */
-+
-+/*
-+ * Threading model.  Choose one:
-+ *
-+ * HAVE_PTHREADS - use the pthreads library.
-+ * HAVE_WIN32_THREADS - use Win32 thread primitives.
-+ *  -- combine HAVE_CREATETHREAD, HAVE_CREATEMUTEX, and HAVE__BEGINTHREADEX
-+ */
-+#define HAVE_PTHREADS
-+
-+/*
-+ * Do we have pthread_setname_np()?
-+ *
-+ * (HAVE_PTHREAD_SETNAME_NP is used by WebKit to enable a function with
-+ * the same name but different parameters, so we can't use that here.)
-+ */
-+#define HAVE_ANDROID_PTHREAD_SETNAME_NP
-+
-+/*
-+ * Do we have the futex syscall?
-+ */
-+#define HAVE_FUTEX
-+
-+/*
-+ * Process creation model.  Choose one:
-+ *
-+ * HAVE_FORKEXEC - use fork() and exec()
-+ * HAVE_WIN32_PROC - use CreateProcess()
-+ */
-+#define HAVE_FORKEXEC
-+
-+/*
-+ * Process out-of-memory adjustment.  Set if running on Linux,
-+ * where we can write to /proc/<pid>/oom_adj to modify the out-of-memory
-+ * badness adjustment.
-+ */
-+#define HAVE_OOM_ADJ
-+
-+/*
-+ * IPC model.  Choose one:
-+ *
-+ * HAVE_SYSV_IPC - use the classic SysV IPC mechanisms (semget, shmget).
-+ * HAVE_MACOSX_IPC - use Macintosh IPC mechanisms (sem_open, mmap).
-+ * HAVE_WIN32_IPC - use Win32 IPC (CreateSemaphore, CreateFileMapping).
-+ * HAVE_ANDROID_IPC - use Android versions (?, mmap).
-+ */
-+#define HAVE_ANDROID_IPC
-+
-+/*
-+ * Memory-mapping model. Choose one:
-+ *
-+ * HAVE_POSIX_FILEMAP - use the Posix sys/mmap.h
-+ * HAVE_WIN32_FILEMAP - use Win32 filemaps
-+ */
-+#define  HAVE_POSIX_FILEMAP
-+
-+/*
-+ * Define this if you have <termio.h>
-+ */
-+#define  HAVE_TERMIO_H 1
-+
-+/*
-+ * Define this if you have <sys/sendfile.h>
-+ */
-+#define  HAVE_SYS_SENDFILE_H 1
-+
-+/*
-+ * Define this if you build against MSVCRT.DLL
-+ */
-+/* #define HAVE_MS_C_RUNTIME */
-+
-+/*
-+ * Define this if you have sys/uio.h
-+ */
-+#define  HAVE_SYS_UIO_H 1
-+
-+/*
-+ * Define this if your platforms implements symbolic links
-+ * in its filesystems
-+ */
-+#define HAVE_SYMLINKS
-+
-+/*
-+ * Define this if we have localtime_r().
-+ */
-+/* #define HAVE_LOCALTIME_R 1 */
-+
-+/*
-+ * Define this if we have gethostbyname_r().
-+ */
-+/* #define HAVE_GETHOSTBYNAME_R */
-+
-+/*
-+ * Define this if we have ioctl().
-+ */
-+#define HAVE_IOCTL
-+
-+/*
-+ * Define this if we want to use WinSock.
-+ */
-+/* #define HAVE_WINSOCK */
-+
-+/*
-+ * Define this if have clock_gettime() and friends
-+ */
-+#define HAVE_POSIX_CLOCKS
-+
-+/*
-+ * Define this if we have linux style epoll()
-+ */
-+#define HAVE_EPOLL
-+
-+/*
-+ * Endianness of the target machine.  Choose one:
-+ *
-+ * HAVE_ENDIAN_H -- have endian.h header we can include.
-+ * HAVE_LITTLE_ENDIAN -- we are little endian.
-+ * HAVE_BIG_ENDIAN -- we are big endian.
-+ */
-+#define HAVE_ENDIAN_H
-+#define HAVE_LITTLE_ENDIAN
-+
-+#define _FILE_OFFSET_BITS 64
-+/* #define _LARGEFILE_SOURCE 1 */
-+
-+/*
-+ * Define if platform has off64_t (and lseek64 and other xxx64 functions)
-+ */
-+#define HAVE_OFF64_T
-+
-+/*
-+ * Defined if we have the backtrace() call for retrieving a stack trace.
-+ * Needed for CallStack to operate; if not defined, CallStack is
-+ * non-functional.
-+ */
-+#define HAVE_BACKTRACE 0
-+
-+/*
-+ * Defined if we have the cxxabi.h header for demangling C++ symbols.  If
-+ * not defined, stack crawls will be displayed with raw mangled symbols
-+ */
-+#define HAVE_CXXABI 0
-+
-+/*
-+ * Defined if we have the gettid() system call.
-+ */
-+#define HAVE_GETTID
-+
-+/*
-+ * Defined if we have the sched_setscheduler() call
-+ */
-+#define HAVE_SCHED_SETSCHEDULER
-+
-+/*
-+ * Add any extra platform-specific defines here.
-+ */
-+#ifndef __linux__
-+#define __linux__
-+#endif
-+
-+/*
-+ * Define if we have <malloc.h> header
-+ */
-+#define HAVE_MALLOC_H
-+
-+/*
-+ * Define if we're running on *our* linux on device or emulator.
-+ */
-+#define HAVE_ANDROID_OS 1
-+
-+/*
-+ * Define if we have Linux-style non-filesystem Unix Domain Sockets
-+ */
-+#define HAVE_LINUX_LOCAL_SOCKET_NAMESPACE 1
-+
-+/*
-+ * Define if we have Linux's inotify in <sys/inotify.h>.
-+ */
-+#define HAVE_INOTIFY 1
-+
-+/*
-+ * Define if we have madvise() in <sys/mman.h>
-+ */
-+#define HAVE_MADVISE 1
-+
-+/*
-+ * Define if tm struct has tm_gmtoff field
-+ */
-+#define HAVE_TM_GMTOFF 1
-+
-+/*
-+ * Define if dirent struct has d_type field
-+ */
-+#define HAVE_DIRENT_D_TYPE 1
-+
-+/*
-+ * Define if libc includes Android system properties implementation.
-+ */
-+#define HAVE_LIBC_SYSTEM_PROPERTIES 1
-+
-+/*
-+ * Define if system provides a system property server (should be
-+ * mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES).
-+ */
-+/* #define HAVE_SYSTEM_PROPERTY_SERVER */
-+
-+/*
-+ * What CPU architecture does this platform use?
-+ */
-+#define ARCH_AARCH64
-+
-+/*
-+ * Define if the size of enums is as short as possible,
-+ */
-+/* #define HAVE_SHORT_ENUMS */
-+
-+/*
-+ * sprintf() format string for shared library naming.
-+ */
-+#define OS_SHARED_LIB_FORMAT_STR    "lib%s.so"
-+
-+/*
-+ * type for the third argument to mincore().
-+ */
-+#define MINCORE_POINTER_TYPE unsigned char *
-+
-+/*
-+ * The default path separator for the platform
-+ */
-+#define OS_PATH_SEPARATOR '/'
-+
-+/*
-+ * Is the filesystem case sensitive?
-+ */
-+#define OS_CASE_SENSITIVE
-+
-+/*
-+ * Define if <sys/socket.h> exists.
-+ */
-+#define HAVE_SYS_SOCKET_H 1
-+
-+/*
-+ * Define if the strlcpy() function exists on the system.
-+ */
-+#define HAVE_STRLCPY 1
-+
-+/*
-+ * Define if the open_memstream() function exists on the system.
-+ */
-+/* #define HAVE_OPEN_MEMSTREAM 1 */
-+
-+/*
-+ * Define if the BSD funopen() function exists on the system.
-+ */
-+#define HAVE_FUNOPEN 1
-+
-+/*
-+ * Define if prctl() exists
-+ */
-+#define HAVE_PRCTL 1
-+
-+/*
-+ * Define if writev() exists
-+ */
-+#define HAVE_WRITEV 1
-+
-+/*
-+ * Define if <stdint.h> exists.
-+ */
-+#define HAVE_STDINT_H 1
-+
-+/*
-+ * Define if <stdbool.h> exists.
-+ */
-+#define HAVE_STDBOOL_H 1
-+
-+/*
-+ * Define if <sched.h> exists.
-+ */
-+#define HAVE_SCHED_H 1
-+
-+/*
-+ * Define if pread() exists
-+ */
-+#define HAVE_PREAD 1
-+
-+/*
-+ * Define if we have st_mtim in struct stat
-+ */
-+#define HAVE_STAT_ST_MTIM 1
-+
-+/*
-+ * Define if printf() supports %zd for size_t arguments
-+ */
-+#define HAVE_PRINTF_ZD 1
-+
-+/*
-+ * Define to 1 if <stdlib.h> provides qsort_r() with a BSD style function prototype.
-+ */
-+#define HAVE_BSD_QSORT_R 0
-+
-+/*
-+ * Define to 1 if <stdlib.h> provides qsort_r() with a GNU style function prototype.
-+ */
-+#define HAVE_GNU_QSORT_R 0
-+
-+#endif /* _ANDROID_CONFIG_H */
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch
deleted file mode 100644
index 7d20c50680..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7b7200727413ca4a9bb132221c543ec033dffafa Mon Sep 17 00:00:00 2001
-From: Sergio Schvezov <sergio.schvezov@canonical.com>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] adb: remove selinux extensions
-
-* drop useless includes of Android SELINUX extensions
-* avoids having to clone another module
-* this should be sent upstream
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- adb/file_sync_service.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c
-index 7933858516..3cbd0cd863 100644
---- a/adb/file_sync_service.c
-+++ b/adb/file_sync_service.c
-@@ -26,7 +26,6 @@
- 
- #include <errno.h>
- #include <private/android_filesystem_config.h>
--#include <selinux/android.h>
- #include "sysdeps.h"
- 
- #define TRACE_TAG  TRACE_SYNC
-@@ -73,7 +72,6 @@ static int mkdirs(char *name)
-                 *x = '/';
-                 return ret;
-             }
--            selinux_android_restorecon(name, 0);
-         }
-         *x++ = '/';
-     }
-@@ -251,7 +249,6 @@ static int handle_send_file(int s, char *path, uid_t uid,
-     if(fd >= 0) {
-         struct utimbuf u;
-         adb_close(fd);
--        selinux_android_restorecon(path, 0);
-         u.actime = timestamp;
-         u.modtime = timestamp;
-         utime(path, &u);
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch
deleted file mode 100644
index 82e97152be..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From db3a3714be07c8ab51b9ae7b035e4afe9f39c645 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 7 Sep 2022 13:20:22 -0700
-Subject: [PATCH] memory.h: Always define strlcpy for glibc based systems
-
-android-config.h file includes on compiler cmdline sets HAVE_STRLCPY
-unconditionally, since bionic supports it, its no big deal on android
-and also no problem when using musl since implementation exists for musl
-too, but glibc does not provide this. So either we include libbsd or use
-the implementation provided by android-tools here. We are currently
-using the in tree implementation for systems which do not provide it
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/cutils/memory.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/cutils/memory.h b/include/cutils/memory.h
-index e725cdd032..9e99353c58 100644
---- a/include/cutils/memory.h
-+++ b/include/cutils/memory.h
-@@ -30,7 +30,7 @@ void android_memset16(uint16_t* dst, uint16_t value, size_t size);
- /* size is given in bytes and must be multiple of 4 */
- void android_memset32(uint32_t* dst, uint32_t value, size_t size);
- 
--#if !HAVE_STRLCPY
-+#if !HAVE_STRLCPY || defined(__GLIBC__)
- /* Declaration of strlcpy() for platforms that don't already have it. */
- size_t strlcpy(char *dst, const char *src, size_t size);
- #endif
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch
deleted file mode 100644
index 3627110ad8..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From d855f042ca09a358cebe2d3c1d29d512afd7ebb8 Mon Sep 17 00:00:00 2001
-From: Hilko Bengen <bengen@debian.org>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] adb: Use local sockets where appropriate
-
-Upstream-Status: Inappropriate
----
- adb/adb.c             | 6 +++++-
- adb/adb_client.c      | 5 +++--
- adb/transport_local.c | 3 ++-
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/adb/adb.c b/adb/adb.c
-index 10a1e0da26..027edd9359 100644
---- a/adb/adb.c
-+++ b/adb/adb.c
-@@ -1230,7 +1230,11 @@ int launch_server(int server_port)
-  */
- void build_local_name(char* target_str, size_t target_size, int server_port)
- {
--  snprintf(target_str, target_size, "tcp:%d", server_port);
-+  if (gListenAll > 0) {
-+    snprintf(target_str, target_size, "tcp:%d", server_port);
-+  } else {
-+    snprintf(target_str, target_size, "local:%d", server_port);
-+  }
- }
- 
- #if !ADB_HOST
-diff --git a/adb/adb_client.c b/adb/adb_client.c
-index eb1720d22c..a383faefe3 100644
---- a/adb/adb_client.c
-+++ b/adb/adb_client.c
-@@ -185,12 +185,12 @@ int _adb_connect(const char *service)
-         strcpy(__adb_error, "service name too long");
-         return -1;
-     }
--    snprintf(tmp, sizeof tmp, "%04x", len);
-+    snprintf(tmp, sizeof tmp, "%d", __adb_server_port);
- 
-     if (__adb_server_name)
-         fd = socket_network_client(__adb_server_name, __adb_server_port, SOCK_STREAM);
-     else
--        fd = socket_loopback_client(__adb_server_port, SOCK_STREAM);
-+        fd = socket_local_client(tmp, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
- 
-     if(fd < 0) {
-         strcpy(__adb_error, "cannot connect to daemon");
-@@ -201,6 +201,7 @@ int _adb_connect(const char *service)
-         return -1;
-     }
- 
-+    snprintf(tmp, sizeof tmp, "%04x", len);
-     if(writex(fd, tmp, 4) || writex(fd, service, len)) {
-         strcpy(__adb_error, "write failure during connection");
-         adb_close(fd);
-diff --git a/adb/transport_local.c b/adb/transport_local.c
-index 948cc15812..71582a8c88 100644
---- a/adb/transport_local.c
-+++ b/adb/transport_local.c
-@@ -121,7 +121,8 @@ int local_connect_arbitrary_ports(int console_port, int adb_port)
-     }
- #endif
-     if (fd < 0) {
--        fd = socket_loopback_client(adb_port, SOCK_STREAM);
-+        snprintf(buf, sizeof buf, "%d", adb_port);
-+        fd = socket_local_client(buf, ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_STREAM);
-     }
- 
-     if (fd >= 0) {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch
deleted file mode 100644
index cf1d9cbc3d..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4421c2e19946dcd651fd8ac022b96627fc526149 Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] adb: define shell command
-
-we intend to run on Linux system so the shell is always /bin/sh,
-for the host or the target.
-
-Upstream-Status: Inappropriate
----
- adb/services.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/adb/services.c b/adb/services.c
-index 21b08dc201..d44b0c5068 100644
---- a/adb/services.c
-+++ b/adb/services.c
-@@ -299,11 +299,7 @@ static int create_subproc_raw(const char *cmd, const char *arg0, const char *arg
- }
- #endif  /* !ABD_HOST */
- 
--#if ADB_HOST
- #define SHELL_COMMAND "/bin/sh"
--#else
--#define SHELL_COMMAND "/system/bin/sh"
--#endif
- 
- #if !ADB_HOST
- static void subproc_waiter_service(int fd, void *cookie)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch
deleted file mode 100644
index 7f03cd2beb..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 548b8ca62c64a16305929e2eaf3d546d48de9c25 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 21 Feb 2017 19:46:24 +0100
-Subject: [PATCH] adb: Fix build on big endian systems
-
-The usb_linux_client.c file defines cpu_to_le16/32 by using the C
-library htole16/32 function calls. However, cpu_to_le16/32 are used
-when initializing structures, i.e in a context where a function call
-is not allowed.
-
-It works fine on little endian systems because htole16/32 are defined
-by the C library as no-ops. But on big-endian systems, they are
-actually doing something, which might involve calling a function,
-causing build failures.
-
-To solve this, we simply open-code cpu_to_le16/32 in a way that allows
-them to be used when initializing structures.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-Upstream-Status: Pending
-
- adb/usb_linux_client.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/adb/usb_linux_client.c b/adb/usb_linux_client.c
-index 8426e0ea14..6e8b5bbbd2 100644
---- a/adb/usb_linux_client.c
-+++ b/adb/usb_linux_client.c
-@@ -34,8 +34,15 @@
- #define MAX_PACKET_SIZE_FS     64
- #define MAX_PACKET_SIZE_HS     512
- 
--#define cpu_to_le16(x)  htole16(x)
--#define cpu_to_le32(x)  htole32(x)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+# define cpu_to_le16(x) (x)
-+# define cpu_to_le32(x) (x)
-+#else
-+# define cpu_to_le16(x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))
-+# define cpu_to_le32(x) \
-+       ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >>  8) | \
-+        (((x) & 0x0000ff00u) <<  8) | (((x) & 0x000000ffu) << 24))
-+#endif
- 
- struct usb_handle
- {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch
deleted file mode 100644
index 4827ffe042..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-From 753bcb5971401b82fb2e6197d31c9e386f6d0392 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 15 Sep 2017 15:46:38 -0700
-Subject: [PATCH] adb: add base64 implementation
-
-musl needs it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- adb/adb_auth_client.c |   2 +-
- adb/base64.c          | 315 ++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 316 insertions(+), 1 deletion(-)
- create mode 100644 adb/base64.c
-
-diff --git a/adb/adb_auth_client.c b/adb/adb_auth_client.c
-index 55e9dcad19..104b413b8b 100644
---- a/adb/adb_auth_client.c
-+++ b/adb/adb_auth_client.c
-@@ -75,7 +75,7 @@ static void read_keys(const char *file, struct listnode *list)
-         if (sep)
-             *sep = '\0';
- 
--        ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
-+        ret = b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
-         if (ret != sizeof(key->key)) {
-             D("%s: Invalid base64 data ret=%d\n", file, ret);
-             free(key);
-diff --git a/adb/base64.c b/adb/base64.c
-new file mode 100644
-index 0000000000..95da284d0d
---- /dev/null
-+++ b/adb/base64.c
-@@ -0,0 +1,315 @@
-+/*
-+ * Copyright (c) 1996-1999 by Internet Software Consortium.
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+ * SOFTWARE.
-+ */
-+
-+/*
-+ * Portions Copyright (c) 1995 by International Business Machines, Inc.
-+ *
-+ * International Business Machines, Inc. (hereinafter called IBM) grants
-+ * permission under its copyrights to use, copy, modify, and distribute this
-+ * Software with or without fee, provided that the above copyright notice and
-+ * all paragraphs of this notice appear in all copies, and that the name of IBM
-+ * not be used in connection with the marketing of any product incorporating
-+ * the Software or modifications thereof, without specific, written prior
-+ * permission.
-+ *
-+ * To the extent it has a right to do so, IBM grants an immunity from suit
-+ * under its patents, if any, for the use, sale or manufacture of products to
-+ * the extent that such products are used for performing Domain Name System
-+ * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
-+ * granted for any product per se or for any other function of any product.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
-+ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
-+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
-+ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
-+ */
-+
-+#if !defined(LINT) && !defined(CODECENTER)
-+static const char rcsid[] = "$BINDId: base64.c,v 8.7 1999/10/13 16:39:33 vixie Exp $";
-+#endif /* not lint */
-+
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/socket.h>
-+
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <arpa/nameser.h>
-+
-+#include <ctype.h>
-+#include <resolv.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <string.h>
-+
-+#define Assert(Cond) if (!(Cond)) abort()
-+
-+static const char Base64[] =
-+       "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+static const char Pad64 = '=';
-+
-+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-+   The following encoding technique is taken from RFC 1521 by Borenstein
-+   and Freed.  It is reproduced here in a slightly edited form for
-+   convenience.
-+
-+   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-+   represented per printable character. (The extra 65th character, "=",
-+   is used to signify a special processing function.)
-+
-+   The encoding process represents 24-bit groups of input bits as output
-+   strings of 4 encoded characters. Proceeding from left to right, a
-+   24-bit input group is formed by concatenating 3 8-bit input groups.
-+   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-+   of which is translated into a single digit in the base64 alphabet.
-+
-+   Each 6-bit group is used as an index into an array of 64 printable
-+   characters. The character referenced by the index is placed in the
-+   output string.
-+
-+                         Table 1: The Base64 Alphabet
-+
-+      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-+          0 A            17 R            34 i            51 z
-+          1 B            18 S            35 j            52 0
-+          2 C            19 T            36 k            53 1
-+          3 D            20 U            37 l            54 2
-+          4 E            21 V            38 m            55 3
-+          5 F            22 W            39 n            56 4
-+          6 G            23 X            40 o            57 5
-+          7 H            24 Y            41 p            58 6
-+          8 I            25 Z            42 q            59 7
-+          9 J            26 a            43 r            60 8
-+         10 K            27 b            44 s            61 9
-+         11 L            28 c            45 t            62 +
-+         12 M            29 d            46 u            63 /
-+         13 N            30 e            47 v
-+         14 O            31 f            48 w         (pad) =
-+         15 P            32 g            49 x
-+         16 Q            33 h            50 y
-+
-+   Special processing is performed if fewer than 24 bits are available
-+   at the end of the data being encoded.  A full encoding quantum is
-+   always completed at the end of a quantity.  When fewer than 24 input
-+   bits are available in an input group, zero bits are added (on the
-+   right) to form an integral number of 6-bit groups.  Padding at the
-+   end of the data is performed using the '=' character.
-+
-+   Since all base64 input is an integral number of octets, only the
-+         -------------------------------------------------
-+   following cases can arise:
-+
-+       (1) the final quantum of encoding input is an integral
-+           multiple of 24 bits; here, the final unit of encoded
-+          output will be an integral multiple of 4 characters
-+          with no "=" padding,
-+       (2) the final quantum of encoding input is exactly 8 bits;
-+           here, the final unit of encoded output will be two
-+          characters followed by two "=" padding characters, or
-+       (3) the final quantum of encoding input is exactly 16 bits;
-+           here, the final unit of encoded output will be three
-+          characters followed by one "=" padding character.
-+   */
-+
-+int
-+b64_ntop(const uint8_t* src, size_t srclength, char* target, size_t targsize)
-+{
-+       size_t datalength = 0;
-+       uint8_t input[3];
-+       uint8_t output[4];
-+       size_t i;
-+
-+       while (2 < srclength) {
-+               input[0] = *src++;
-+               input[1] = *src++;
-+               input[2] = *src++;
-+               srclength -= 3;
-+
-+               output[0] = input[0] >> 2;
-+               output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+               output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+               output[3] = input[2] & 0x3f;
-+               Assert(output[0] < 64);
-+               Assert(output[1] < 64);
-+               Assert(output[2] < 64);
-+               Assert(output[3] < 64);
-+
-+               if (datalength + 4 > targsize)
-+                       return (-1);
-+               target[datalength++] = Base64[output[0]];
-+               target[datalength++] = Base64[output[1]];
-+               target[datalength++] = Base64[output[2]];
-+               target[datalength++] = Base64[output[3]];
-+       }
-+
-+       /* Now we worry about padding. */
-+       if (0 != srclength) {
-+               /* Get what's left. */
-+               input[0] = input[1] = input[2] = '\0';
-+               for (i = 0; i < srclength; i++)
-+                       input[i] = *src++;
-+
-+               output[0] = input[0] >> 2;
-+               output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-+               output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-+               Assert(output[0] < 64);
-+               Assert(output[1] < 64);
-+               Assert(output[2] < 64);
-+
-+               if (datalength + 4 > targsize)
-+                       return (-1);
-+               target[datalength++] = Base64[output[0]];
-+               target[datalength++] = Base64[output[1]];
-+               if (srclength == 1)
-+                       target[datalength++] = Pad64;
-+               else
-+                       target[datalength++] = Base64[output[2]];
-+               target[datalength++] = Pad64;
-+       }
-+       if (datalength >= targsize)
-+               return (-1);
-+       target[datalength] = '\0';      /* Returned value doesn't count \0. */
-+       return (datalength);
-+}
-+
-+/* skips all whitespace anywhere.
-+   converts characters, four at a time, starting at (or after)
-+   src from base - 64 numbers into three 8 bit bytes in the target area.
-+   it returns the number of data bytes stored at the target, or -1 on error.
-+ */
-+
-+int b64_pton(const char* src, uint8_t* target, size_t targsize)
-+{
-+       int tarindex, state, ch;
-+       char *pos;
-+
-+       state = 0;
-+       tarindex = 0;
-+
-+       while ((ch = *src++) != '\0') {
-+               if (isspace(ch))        /* Skip whitespace anywhere. */
-+                       continue;
-+
-+               if (ch == Pad64)
-+                       break;
-+
-+               pos = strchr(Base64, ch);
-+               if (pos == 0)           /* A non-base64 character. */
-+                       return (-1);
-+
-+               switch (state) {
-+               case 0:
-+                       if (target) {
-+                               if ((size_t)tarindex >= targsize)
-+                                       return (-1);
-+                               target[tarindex] = (pos - Base64) << 2;
-+                       }
-+                       state = 1;
-+                       break;
-+               case 1:
-+                       if (target) {
-+                               if ((size_t)tarindex + 1 >= targsize)
-+                                       return (-1);
-+                               target[tarindex]   |=  (pos - Base64) >> 4;
-+                               target[tarindex+1]  = ((pos - Base64) & 0x0f)
-+                                                       << 4 ;
-+                       }
-+                       tarindex++;
-+                       state = 2;
-+                       break;
-+               case 2:
-+                       if (target) {
-+                               if ((size_t)tarindex + 1 >= targsize)
-+                                       return (-1);
-+                               target[tarindex]   |=  (pos - Base64) >> 2;
-+                               target[tarindex+1]  = ((pos - Base64) & 0x03)
-+                                                       << 6;
-+                       }
-+                       tarindex++;
-+                       state = 3;
-+                       break;
-+               case 3:
-+                       if (target) {
-+                               if ((size_t)tarindex >= targsize)
-+                                       return (-1);
-+                               target[tarindex] |= (pos - Base64);
-+                       }
-+                       tarindex++;
-+                       state = 0;
-+                       break;
-+               default:
-+                       abort();
-+               }
-+       }
-+
-+       /*
-+        * We are done decoding Base-64 chars.  Let's see if we ended
-+        * on a byte boundary, and/or with erroneous trailing characters.
-+        */
-+
-+       if (ch == Pad64) {              /* We got a pad char. */
-+               ch = *src++;            /* Skip it, get next. */
-+               switch (state) {
-+               case 0:         /* Invalid = in first position */
-+               case 1:         /* Invalid = in second position */
-+                       return (-1);
-+
-+               case 2:         /* Valid, means one byte of info */
-+                       /* Skip any number of spaces. */
-+                       for ((void)NULL; ch != '\0'; ch = *src++)
-+                               if (!isspace(ch))
-+                                       break;
-+                       /* Make sure there is another trailing = sign. */
-+                       if (ch != Pad64)
-+                               return (-1);
-+                       ch = *src++;            /* Skip the = */
-+                       /* Fall through to "single trailing =" case. */
-+                       /* FALLTHROUGH */
-+
-+               case 3:         /* Valid, means two bytes of info */
-+                       /*
-+                        * We know this char is an =.  Is there anything but
-+                        * whitespace after it?
-+                        */
-+                       for ((void)NULL; ch != '\0'; ch = *src++)
-+                               if (!isspace(ch))
-+                                       return (-1);
-+
-+                       /*
-+                        * Now make sure for cases 2 and 3 that the "extra"
-+                        * bits that slopped past the last full byte were
-+                        * zeros.  If we don't check them, they become a
-+                        * subliminal channel.
-+                        */
-+                       if (target && target[tarindex] != 0)
-+                               return (-1);
-+               }
-+       } else {
-+               /*
-+                * We ended by seeing the end of the string.  Make sure we
-+                * have no partial bytes lying around.
-+                */
-+               if (state != 0)
-+                       return (-1);
-+       }
-+
-+       return (tarindex);
-+}
-+
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch
deleted file mode 100644
index 182b1eb29e..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 62d957a1271c88ec08d67984fbe31601f0bd41a9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 15 Sep 2017 15:50:57 -0700
-Subject: [PATCH] adb: Musl fixes
-
-__nonnull is gcc specific
-include sys/types.h for size_t
-Do not redefine close() and lseek()
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- adb/adb.h                    |  2 ++
- adb/disable_verity_service.c | 13 ++++++++-----
- adb/framebuffer_service.c    |  7 ++++---
- adb/sysdeps.h                | 12 ++++++------
- 4 files changed, 20 insertions(+), 14 deletions(-)
-
---- a/adb/adb.h
-+++ b/adb/adb.h
-@@ -18,7 +18,9 @@
- #define __ADB_H
- 
- #include <limits.h>
-+#include <sys/types.h>
- 
-+#include "fdevent.h"
- #include "adb_trace.h"
- #include "transport.h"  /* readx(), writex() */
- 
---- a/adb/disable_verity_service.c
-+++ b/adb/disable_verity_service.c
-@@ -14,25 +14,32 @@
-  * limitations under the License.
-  */
- 
--#include "sysdeps.h"
- 
- #define  TRACE_TAG  TRACE_ADB
- #include "adb.h"
-+#include "sysdeps.h"
-+#include "cutils/properties.h"
-+#include "ext4_sb.h"
-+#include <fs_mgr.h>
- 
- #include <stdio.h>
- #include <stdarg.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <inttypes.h>
--
--#include "cutils/properties.h"
--#include "ext4_sb.h"
--#include <fs_mgr.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <stdbool.h>
-+
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define lseek64 lseek
-+#define off64_t off_t
-+#endif
- 
- #define FSTAB_PREFIX "/fstab."
- struct fstab *fstab;
- 
--__attribute__((__format__(printf, 2, 3))) __nonnull((2))
-+__attribute__((__format__(printf, 2, 3))) __attribute__((nonnull((2))))
- static void write_console(int fd, const char* format, ...)
- {
-     char buffer[256];
---- a/adb/framebuffer_service.c
-+++ b/adb/framebuffer_service.c
-@@ -14,6 +14,10 @@
-  * limitations under the License.
-  */
- 
-+#include "fdevent.h"
-+#include "adb.h"
-+#include "sysdeps.h"
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-@@ -23,9 +27,6 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- 
--#include "fdevent.h"
--#include "adb.h"
--
- #include <linux/fb.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
---- a/adb/sysdeps.h
-+++ b/adb/sysdeps.h
-@@ -123,8 +123,8 @@ static __inline__ int  unix_close(int fd
- {
-     return close(fd);
- }
--#undef   close
--#define  close   ____xxx_close
-+//#undef   close
-+//#define  close   ____xxx_close
- 
- static __inline__  int  unix_read(int  fd, void*  buf, size_t  len)
- {
-@@ -369,8 +369,8 @@ static __inline__ int  adb_close(int fd)
- {
-     return close(fd);
- }
--#undef   close
--#define  close   ____xxx_close
-+//#undef   close
-+//#define  close   ____xxx_close
- 
- 
- static __inline__  int  adb_read(int  fd, void*  buf, size_t  len)
-@@ -392,8 +392,8 @@ static __inline__ int   adb_lseek(int  f
- {
-     return lseek(fd, pos, where);
- }
--#undef   lseek
--#define  lseek   ___xxx_lseek
-+//#undef   lseek
-+//#define  lseek   ___xxx_lseek
- 
- static __inline__  int    adb_unlink(const char*  path)
- {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch
deleted file mode 100644
index 64fbce4cbe..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From de393bba41c8feff932c77d6c30233945f380d42 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sat, 11 Aug 2018 13:23:37 +0000
-Subject: [PATCH] adb: usb_linux.c: fix build with glibc-2.28
-
-* include sysmacros for major, minor
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
-Upstream-Status: Pending
-
- adb/usb_linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/adb/usb_linux.c b/adb/usb_linux.c
-index f16bdd0361..c8a7732441 100644
---- a/adb/usb_linux.c
-+++ b/adb/usb_linux.c
-@@ -22,6 +22,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/time.h>
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- #include <fcntl.h>
- #include <errno.h>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch
deleted file mode 100644
index ad21b5aaa6..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3a788e9168c9b9eac66c4fa479413f4a95c61be4 Mon Sep 17 00:00:00 2001
-From: Florent Revest <revestflo@gmail.com>
-Date: Mon, 30 Oct 2017 21:05:46 +0100
-Subject: [PATCH] adb: Allow adbd to be ran as root
-
----
-Upstream-Status: Pending
-
- adb/adb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/adb/adb.c b/adb/adb.c
-index 027edd9359..e0f7ecde45 100644
---- a/adb/adb.c
-+++ b/adb/adb.c
-@@ -1271,6 +1271,7 @@ static int should_drop_privileges() {
-     int secure = 0;
-     char value[PROPERTY_VALUE_MAX];
- 
-+    return 0;
-    /* run adbd in secure mode if ro.secure is set and
-     ** we are not in the emulator
-     */
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch
deleted file mode 100644
index a4dc6e1e35..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From dd195778a9930b7967b21a3b8eb390b70253dbad Mon Sep 17 00:00:00 2001
-From: David Ng <dave@codeaurora.org>
-Date: Fri, 27 Jul 2012 17:15:03 -0700
-Subject: [PATCH] mkbootimg: Add --dt parameter to specify DT image
-
-New optional --dt parameter to specify a kernel device
-tree image.
-
-Upstream-Status: Inappropriate
----
- mkbootimg/bootimg.h   |  7 +++++--
- mkbootimg/mkbootimg.c | 21 +++++++++++++++++++++
- 2 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/mkbootimg/bootimg.h b/mkbootimg/bootimg.h
-index 9171d85a7b..308c537d6b 100644
---- a/mkbootimg/bootimg.h
-+++ b/mkbootimg/bootimg.h
-@@ -41,8 +41,8 @@ struct boot_img_hdr
- 
-     unsigned tags_addr;    /* physical addr for kernel tags */
-     unsigned page_size;    /* flash page size we assume */
--    unsigned unused[2];    /* future expansion: should be 0 */
--
-+    unsigned dt_size;      /* device tree in bytes */
-+    unsigned unused;       /* future expansion: should be 0 */
-     unsigned char name[BOOT_NAME_SIZE]; /* asciiz product name */
- 
-     unsigned char cmdline[BOOT_ARGS_SIZE];
-@@ -64,10 +64,13 @@ struct boot_img_hdr
- ** +-----------------+
- ** | second stage    | o pages
- ** +-----------------+
-+** | device tree     | p pages
-+** +-----------------+
- **
- ** n = (kernel_size + page_size - 1) / page_size
- ** m = (ramdisk_size + page_size - 1) / page_size
- ** o = (second_size + page_size - 1) / page_size
-+** p = (dt_size + page_size - 1) / page_size
- **
- ** 0. all entities are page_size aligned in flash
- ** 1. kernel and ramdisk are required (size != 0)
-diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
-index fc92b4dc30..658052cdf2 100644
---- a/mkbootimg/mkbootimg.c
-+++ b/mkbootimg/mkbootimg.c
-@@ -65,6 +65,7 @@ int usage(void)
-             "       [ --board <boardname> ]\n"
-             "       [ --base <address> ]\n"
-             "       [ --pagesize <pagesize> ]\n"
-+            "       [ --dt <filename> ]\n"
-             "       -o|--output <filename>\n"
-             );
-     return 1;
-@@ -105,6 +106,8 @@ int main(int argc, char **argv)
-     char *cmdline = "";
-     char *bootimg = 0;
-     char *board = "";
-+    char *dt_fn = 0;
-+    void *dt_data = 0;
-     unsigned pagesize = 2048;
-     int fd;
-     SHA_CTX ctx;
-@@ -158,6 +161,8 @@ int main(int argc, char **argv)
-                 fprintf(stderr,"error: unsupported page size %d\n", pagesize);
-                 return -1;
-             }
-+        } else if(!strcmp(arg, "--dt")) {
-+            dt_fn = val;
-         } else {
-             return usage();
-         }
-@@ -232,6 +237,14 @@ int main(int argc, char **argv)
-         }
-     }
- 
-+    if(dt_fn) {
-+        dt_data = load_file(dt_fn, &hdr.dt_size);
-+        if (dt_data == 0) {
-+            fprintf(stderr,"error: could not load device tree image '%s'\n", dt_fn);
-+            return 1;
-+        }
-+    }
-+
-     /* put a hash of the contents in the header so boot images can be
-      * differentiated based on their first 2k.
-      */
-@@ -242,6 +255,10 @@ int main(int argc, char **argv)
-     SHA_update(&ctx, &hdr.ramdisk_size, sizeof(hdr.ramdisk_size));
-     SHA_update(&ctx, second_data, hdr.second_size);
-     SHA_update(&ctx, &hdr.second_size, sizeof(hdr.second_size));
-+    if(dt_data) {
-+        SHA_update(&ctx, dt_data, hdr.dt_size);
-+        SHA_update(&ctx, &hdr.dt_size, sizeof(hdr.dt_size));
-+    }
-     sha = SHA_final(&ctx);
-     memcpy(hdr.id, sha,
-            SHA_DIGEST_SIZE > sizeof(hdr.id) ? sizeof(hdr.id) : SHA_DIGEST_SIZE);
-@@ -266,6 +283,10 @@ int main(int argc, char **argv)
-         if(write_padding(fd, pagesize, hdr.second_size)) goto fail;
-     }
- 
-+    if(dt_data) {
-+        if(write(fd, dt_data, hdr.dt_size) != (ssize_t) hdr.dt_size) goto fail;
-+        if(write_padding(fd, pagesize, hdr.dt_size)) goto fail;
-+    }
-     return 0;
- 
- fail:
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch
deleted file mode 100644
index 2c607ff67c..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ef743c9c3c7452ae904a5c343ee2b759ab3a87cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@ubuntu.com>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] Use linux/capability.h on linux systems too
-
-Upstream-Status: Inappropriate
----
- include/private/android_filesystem_config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
-index 2f528b95c8..3e0b00928e 100644
---- a/include/private/android_filesystem_config.h
-+++ b/include/private/android_filesystem_config.h
-@@ -27,7 +27,7 @@
- #include <sys/types.h>
- #include <stdint.h>
- 
--#ifdef HAVE_ANDROID_OS
-+#if defined(HAVE_ANDROID_OS) || defined(__linux__)
- #include <linux/capability.h>
- #else
- #include "android_filesystem_capability.h"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch
deleted file mode 100644
index 5b18f461a3..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 9eff8799831961c0edf6e37e5d4cbf43baa7c748 Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] Remove bionic specific calls
-
-Upstream-Status: Inappropriate
----
- include/cutils/properties.h | 1 -
- libcutils/properties.c      | 2 +-
- liblog/logd_write.c         | 5 +++++
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/include/cutils/properties.h b/include/cutils/properties.h
-index 798db8b36f..7d01f28d6e 100644
---- a/include/cutils/properties.h
-+++ b/include/cutils/properties.h
-@@ -19,7 +19,6 @@
- 
- #include <sys/cdefs.h>
- #include <stddef.h>
--#include <sys/system_properties.h>
- #include <stdint.h>
- 
- #ifdef __cplusplus
-diff --git a/libcutils/properties.c b/libcutils/properties.c
-index b283658aa4..4151e7882c 100644
---- a/libcutils/properties.c
-+++ b/libcutils/properties.c
-@@ -104,10 +104,10 @@ int32_t property_get_int32(const char *key, int32_t default_value) {
-     return (int32_t)property_get_imax(key, INT32_MIN, INT32_MAX, default_value);
- }
- 
-+#undef HAVE_LIBC_SYSTEM_PROPERTIES
- #ifdef HAVE_LIBC_SYSTEM_PROPERTIES
- 
- #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
--#include <sys/_system_properties.h>
- 
- int property_set(const char *key, const char *value)
- {
-diff --git a/liblog/logd_write.c b/liblog/logd_write.c
-index b2668cedb7..f5a44fe901 100644
---- a/liblog/logd_write.c
-+++ b/liblog/logd_write.c
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/syscall.h>
- #include <sys/types.h>
- #if (FAKE_LOG_DEVICE == 0)
- #include <sys/socket.h>
-@@ -205,7 +206,11 @@ static int __write_to_log_kernel(log_id_t log_id, struct iovec *vec, size_t nr)
-     realtime_ts.tv_nsec = ts.tv_nsec;
- 
-     log_id_buf = log_id;
-+#ifdef __BIONIC__
-     tid = gettid();
-+#else
-+    tid = (pid_t) syscall(__NR_gettid);
-+#endif
- 
-     newVec[0].iov_base   = (unsigned char *) &log_id_buf;
-     newVec[0].iov_len    = sizeof_log_id_t;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch
deleted file mode 100644
index b0feb65921..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cd4525d760c6f88c9bf85f7bf488da79cd0d3264 Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] Fix implicit declaration of stlcat/strlcopy functions
-
-Upstream-Status: Inappropriate
----
- adb/adb.c                | 1 +
- fs_mgr/fs_mgr_fstab.c    | 2 +-
- include/cutils/sockets.h | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/adb/adb.c b/adb/adb.c
-index e0f7ecde45..aaefd9b401 100644
---- a/adb/adb.c
-+++ b/adb/adb.c
-@@ -41,6 +41,7 @@
- #include <sys/prctl.h>
- #include <getopt.h>
- #include <selinux/selinux.h>
-+#include <grp.h>
- #else
- #include "usb_vendors.h"
- #endif
-diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c
-index edd9591164..9ddb4643b5 100644
---- a/fs_mgr/fs_mgr_fstab.c
-+++ b/fs_mgr/fs_mgr_fstab.c
-@@ -17,7 +17,7 @@
- #include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <string.h>
-+#include <bsd/string.h>
- #include <sys/mount.h>
- 
- #include "fs_mgr_priv.h"
-diff --git a/include/cutils/sockets.h b/include/cutils/sockets.h
-index daf43ec944..d3270c69e7 100644
---- a/include/cutils/sockets.h
-+++ b/include/cutils/sockets.h
-@@ -19,7 +19,7 @@
- 
- #include <errno.h>
- #include <stdlib.h>
--#include <string.h>
-+#include <bsd/string.h>
- #include <stdbool.h>
- 
- #ifdef HAVE_WINSOCK
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch
deleted file mode 100644
index 5138556d63..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 48ddf4fb999931942c359350fb31cd557514e1c6 Mon Sep 17 00:00:00 2001
-From: Chenxi Mao <maochenxi@eswin.com>
-Date: Mon, 20 Apr 2020 15:27:22 +0800
-Subject: [PATCH 1/1] adb: Support riscv64
-
----
-Upstream-Status: Pending
-
- include/cutils/atomic-inline.h  |   2 +
- include/cutils/atomic-riscv64.h | 156 ++++++++++++++++++++++++++++++++
- 2 files changed, 158 insertions(+)
- create mode 100644 include/cutils/atomic-riscv64.h
-
-diff --git a/include/cutils/atomic-inline.h b/include/cutils/atomic-inline.h
-index a31e913579..b5dc38209c 100644
---- a/include/cutils/atomic-inline.h
-+++ b/include/cutils/atomic-inline.h
-@@ -55,6 +55,8 @@ extern "C" {
- #include <cutils/atomic-mips64.h>
- #elif defined(__mips__)
- #include <cutils/atomic-mips.h>
-+#elif defined(__riscv) && __riscv_xlen == 64
-+#include <cutils/atomic-riscv64.h>
- #else
- #error atomic operations are unsupported
- #endif
-diff --git a/include/cutils/atomic-riscv64.h b/include/cutils/atomic-riscv64.h
-new file mode 100644
-index 0000000000..2664db5a86
---- /dev/null
-+++ b/include/cutils/atomic-riscv64.h
-@@ -0,0 +1,156 @@
-+/*
-+ * Copyright (C) 2014 The Android Open Source Project
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *  * Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ *  * Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in
-+ *    the documentation and/or other materials provided with the
-+ *    distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#ifndef ANDROID_CUTILS_ATOMIC_RISCV64_H
-+#define ANDROID_CUTILS_ATOMIC_RISCV64_H
-+
-+#include <stdint.h>
-+
-+#ifndef ANDROID_ATOMIC_INLINE
-+#define ANDROID_ATOMIC_INLINE inline __attribute__((always_inline))
-+#endif
-+
-+/*
-+   TODOAArch64: Revisit the below functions and check for potential
-+   optimizations using assembly code or otherwise.
-+*/
-+
-+extern ANDROID_ATOMIC_INLINE
-+void android_compiler_barrier(void)
-+{
-+    __asm__ __volatile__ ("" : : : "memory");
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+void android_memory_barrier(void)
-+{
-+    __asm__ __volatile__ ("fence rw,rw" : : : "memory");
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_acquire_load(volatile const int32_t *ptr)
-+{
-+    int32_t value = *ptr;
-+    android_memory_barrier();
-+    return value;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_release_load(volatile const int32_t *ptr)
-+{
-+    android_memory_barrier();
-+    return *ptr;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+void android_atomic_acquire_store(int32_t value, volatile int32_t *ptr)
-+{
-+    *ptr = value;
-+    android_memory_barrier();
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+void android_atomic_release_store(int32_t value, volatile int32_t *ptr)
-+{
-+    android_memory_barrier();
-+    *ptr = value;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int android_atomic_cas(int32_t old_value, int32_t new_value,
-+                       volatile int32_t *ptr)
-+{
-+    return __sync_val_compare_and_swap(ptr, old_value, new_value) != old_value;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int android_atomic_acquire_cas(int32_t old_value, int32_t new_value,
-+                               volatile int32_t *ptr)
-+{
-+    int status = android_atomic_cas(old_value, new_value, ptr);
-+    android_memory_barrier();
-+    return status;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int android_atomic_release_cas(int32_t old_value, int32_t new_value,
-+                               volatile int32_t *ptr)
-+{
-+    android_memory_barrier();
-+    return android_atomic_cas(old_value, new_value, ptr);
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_add(int32_t increment, volatile int32_t *ptr)
-+{
-+    int32_t prev, status;
-+    android_memory_barrier();
-+    do {
-+        prev = *ptr;
-+        status = android_atomic_cas(prev, prev + increment, ptr);
-+    } while (__builtin_expect(status != 0, 0));
-+    return prev;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_inc(volatile int32_t *addr)
-+{
-+    return android_atomic_add(1, addr);
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_dec(volatile int32_t *addr)
-+{
-+    return android_atomic_add(-1, addr);
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_and(int32_t value, volatile int32_t *ptr)
-+{
-+    int32_t prev, status;
-+    android_memory_barrier();
-+    do {
-+        prev = *ptr;
-+        status = android_atomic_cas(prev, prev & value, ptr);
-+    } while (__builtin_expect(status != 0, 0));
-+    return prev;
-+}
-+
-+extern ANDROID_ATOMIC_INLINE
-+int32_t android_atomic_or(int32_t value, volatile int32_t *ptr)
-+{
-+    int32_t prev, status;
-+    android_memory_barrier();
-+    do {
-+        prev = *ptr;
-+        status = android_atomic_cas(prev, prev | value, ptr);
-+    } while (__builtin_expect(status != 0, 0));
-+    return prev;
-+}
-+
-+#endif /* ANDROID_CUTILS_ATOMIC_RISCV_H */
--- 
-2.17.1
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch
deleted file mode 100644
index cf23f3c251..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-From dae9a11f3a158357966399aef97c48b5f16934d9 Mon Sep 17 00:00:00 2001
-From: Jiacheng Liu <jiacheng.liu@mediatek.com>
-Date: Sat, 24 Jul 2021 11:01:18 +0800
-Subject: [PATCH] android-tools: adb: add u3 ss descriptor support
-
-Porting u3 Superspeed descriptor support to open-embedded android-tools package.
-This patch origins from the the patch in android project [1], but has been
-modified for backporting to android-tools_5.1.1.r37.
-
-[1] https://android.googlesource.com/platform/system/core/+/d6ee9f26a5163af4121f4380264fcbd4e6851a17%5E%21
-
-Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com>
-Signed-off-by: Jiacheng Liu <jiacheng.liu@mediatek.com>
----
-Upstream-Status: Pending
-
- adb/usb_linux_client.c | 275 +++++++++++++++++++++++++++++++----------
- 1 file changed, 207 insertions(+), 68 deletions(-)
-
-diff --git a/adb/usb_linux_client.c b/adb/usb_linux_client.c
-index 6e8b5bb..884e85e 100644
---- a/adb/usb_linux_client.c
-+++ b/adb/usb_linux_client.c
-@@ -31,8 +31,10 @@
- #define   TRACE_TAG  TRACE_USB
- #include "adb.h"
- 
-+#define USB_EXT_PROP_UNICODE    1
- #define MAX_PACKET_SIZE_FS     64
- #define MAX_PACKET_SIZE_HS     512
-+#define MAX_PACKET_SIZE_SS     1024
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- # define cpu_to_le16(x) (x)
-@@ -62,74 +64,185 @@ struct usb_handle
-     int bulk_in;  /* "in" from the host's perspective => sink for adbd */
- };
- 
--static const struct {
--    struct usb_functionfs_descs_head header;
--    struct {
--        struct usb_interface_descriptor intf;
--        struct usb_endpoint_descriptor_no_audio source;
--        struct usb_endpoint_descriptor_no_audio sink;
--    } __attribute__((packed)) fs_descs, hs_descs;
--} __attribute__((packed)) descriptors = {
--    .header = {
--        .magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC),
--        .length = cpu_to_le32(sizeof(descriptors)),
--        .fs_count = 3,
--        .hs_count = 3,
-+struct func_desc {
-+    struct usb_interface_descriptor intf;
-+    struct usb_endpoint_descriptor_no_audio source;
-+    struct usb_endpoint_descriptor_no_audio sink;
-+} __attribute__((packed));
-+
-+struct ss_func_desc {
-+    struct usb_interface_descriptor intf;
-+    struct usb_endpoint_descriptor_no_audio source;
-+    struct usb_ss_ep_comp_descriptor source_comp;
-+    struct usb_endpoint_descriptor_no_audio sink;
-+    struct usb_ss_ep_comp_descriptor sink_comp;
-+} __attribute__((packed));
-+
-+struct desc_v1 {
-+    struct usb_functionfs_descs_head_v1 {
-+        __le32 magic;
-+        __le32 length;
-+        __le32 fs_count;
-+        __le32 hs_count;
-+    } __attribute__((packed)) header;
-+    struct func_desc fs_descs, hs_descs;
-+} __attribute__((packed));
-+
-+struct usb_os_desc_ext_prop {
-+    uint32_t dwSize;
-+    uint32_t dwPropertyDataType;
-+
-+    // Property name and value are transmitted as UTF-16, but the kernel only
-+    // accepts ASCII values and performs the conversion for us.
-+    uint16_t wPropertyNameLength;
-+    char bPropertyName[20];
-+
-+    uint32_t dwPropertyDataLength;
-+    char bProperty[39];
-+} __attribute__((packed)) os_desc_guid = {
-+    .dwSize = sizeof(struct usb_os_desc_ext_prop),
-+    .dwPropertyDataType = cpu_to_le32(USB_EXT_PROP_UNICODE),
-+    .wPropertyNameLength = cpu_to_le16(20),
-+    .bPropertyName = "DeviceInterfaceGUID",
-+    .dwPropertyDataLength = cpu_to_le32(39),
-+    .bProperty = "{F72FE0D4-CBCB-407D-8814-9ED673D0DD6B}",
-+};
-+
-+struct usb_ext_prop_values {
-+    struct usb_os_desc_ext_prop guid;
-+} __attribute__((packed));
-+
-+struct desc_v2 {
-+    struct usb_functionfs_descs_head_v2 header;
-+    // The rest of the structure depends on the flags in the header.
-+    __le32 fs_count;
-+    __le32 hs_count;
-+    __le32 ss_count;
-+    __le32 os_count;
-+    struct func_desc fs_descs, hs_descs;
-+    struct ss_func_desc ss_descs;
-+    struct usb_os_desc_header os_header;
-+    struct usb_ext_compat_desc os_desc;
-+    struct usb_os_desc_header os_prop_header;
-+    struct usb_ext_prop_values os_prop_values;
-+} __attribute__((packed));
-+
-+static struct func_desc fs_descriptors = {
-+    .intf = {
-+        .bLength = sizeof(fs_descriptors.intf),
-+        .bDescriptorType = USB_DT_INTERFACE,
-+        .bInterfaceNumber = 0,
-+        .bNumEndpoints = 2,
-+        .bInterfaceClass = ADB_CLASS,
-+        .bInterfaceSubClass = ADB_SUBCLASS,
-+        .bInterfaceProtocol = ADB_PROTOCOL,
-+        .iInterface = 1, /* first string from the provided table */
-+    },
-+    .source = {
-+        .bLength = sizeof(fs_descriptors.source),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 1 | USB_DIR_OUT,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_FS,
-+    },
-+    .sink = {
-+        .bLength = sizeof(fs_descriptors.sink),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 2 | USB_DIR_IN,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_FS,
-+    },
-+};
-+
-+static struct func_desc hs_descriptors = {
-+    .intf = {
-+        .bLength = sizeof(hs_descriptors.intf),
-+        .bDescriptorType = USB_DT_INTERFACE,
-+        .bInterfaceNumber = 0,
-+        .bNumEndpoints = 2,
-+        .bInterfaceClass = ADB_CLASS,
-+        .bInterfaceSubClass = ADB_SUBCLASS,
-+        .bInterfaceProtocol = ADB_PROTOCOL,
-+        .iInterface = 1, /* first string from the provided table */
-+    },
-+    .source = {
-+        .bLength = sizeof(hs_descriptors.source),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 1 | USB_DIR_OUT,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_HS,
-+    },
-+    .sink = {
-+        .bLength = sizeof(hs_descriptors.sink),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 2 | USB_DIR_IN,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_HS,
-+    },
-+};
-+
-+static struct ss_func_desc ss_descriptors = {
-+    .intf = {
-+        .bLength = sizeof(ss_descriptors.intf),
-+        .bDescriptorType = USB_DT_INTERFACE,
-+        .bInterfaceNumber = 0,
-+        .bNumEndpoints = 2,
-+        .bInterfaceClass = ADB_CLASS,
-+        .bInterfaceSubClass = ADB_SUBCLASS,
-+        .bInterfaceProtocol = ADB_PROTOCOL,
-+        .iInterface = 1, /* first string from the provided table */
-+    },
-+    .source = {
-+        .bLength = sizeof(ss_descriptors.source),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 1 | USB_DIR_OUT,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_SS,
-+    },
-+    .source_comp = {
-+        .bLength = sizeof(ss_descriptors.source_comp),
-+        .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
-+        .bMaxBurst = 4,
-     },
--    .fs_descs = {
--        .intf = {
--            .bLength = sizeof(descriptors.fs_descs.intf),
--            .bDescriptorType = USB_DT_INTERFACE,
--            .bInterfaceNumber = 0,
--            .bNumEndpoints = 2,
--            .bInterfaceClass = ADB_CLASS,
--            .bInterfaceSubClass = ADB_SUBCLASS,
--            .bInterfaceProtocol = ADB_PROTOCOL,
--            .iInterface = 1, /* first string from the provided table */
--        },
--        .source = {
--            .bLength = sizeof(descriptors.fs_descs.source),
--            .bDescriptorType = USB_DT_ENDPOINT,
--            .bEndpointAddress = 1 | USB_DIR_OUT,
--            .bmAttributes = USB_ENDPOINT_XFER_BULK,
--            .wMaxPacketSize = MAX_PACKET_SIZE_FS,
--        },
--        .sink = {
--            .bLength = sizeof(descriptors.fs_descs.sink),
--            .bDescriptorType = USB_DT_ENDPOINT,
--            .bEndpointAddress = 2 | USB_DIR_IN,
--            .bmAttributes = USB_ENDPOINT_XFER_BULK,
--            .wMaxPacketSize = MAX_PACKET_SIZE_FS,
--        },
-+    .sink = {
-+        .bLength = sizeof(ss_descriptors.sink),
-+        .bDescriptorType = USB_DT_ENDPOINT,
-+        .bEndpointAddress = 2 | USB_DIR_IN,
-+        .bmAttributes = USB_ENDPOINT_XFER_BULK,
-+        .wMaxPacketSize = MAX_PACKET_SIZE_SS,
-     },
--    .hs_descs = {
--        .intf = {
--            .bLength = sizeof(descriptors.hs_descs.intf),
--            .bDescriptorType = USB_DT_INTERFACE,
--            .bInterfaceNumber = 0,
--            .bNumEndpoints = 2,
--            .bInterfaceClass = ADB_CLASS,
--            .bInterfaceSubClass = ADB_SUBCLASS,
--            .bInterfaceProtocol = ADB_PROTOCOL,
--            .iInterface = 1, /* first string from the provided table */
--        },
--        .source = {
--            .bLength = sizeof(descriptors.hs_descs.source),
--            .bDescriptorType = USB_DT_ENDPOINT,
--            .bEndpointAddress = 1 | USB_DIR_OUT,
--            .bmAttributes = USB_ENDPOINT_XFER_BULK,
--            .wMaxPacketSize = MAX_PACKET_SIZE_HS,
--        },
--        .sink = {
--            .bLength = sizeof(descriptors.hs_descs.sink),
--            .bDescriptorType = USB_DT_ENDPOINT,
--            .bEndpointAddress = 2 | USB_DIR_IN,
--            .bmAttributes = USB_ENDPOINT_XFER_BULK,
--            .wMaxPacketSize = MAX_PACKET_SIZE_HS,
--        },
-+    .sink_comp = {
-+        .bLength = sizeof(ss_descriptors.sink_comp),
-+        .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
-+        .bMaxBurst = 4,
-     },
- };
- 
-+struct usb_ext_compat_desc os_desc_compat = {
-+    .bFirstInterfaceNumber = 0,
-+    .Reserved1 = cpu_to_le32(1),
-+    .CompatibleID = { 'W', 'I', 'N', 'U', 'S', 'B', '\0', '\0'},
-+    .SubCompatibleID = {0},
-+    .Reserved2 = {0},
-+};
-+
-+static struct usb_os_desc_header os_desc_header = {
-+    .interface = cpu_to_le32(0),
-+    .dwLength = cpu_to_le32(sizeof(os_desc_header) + sizeof(os_desc_compat)),
-+    .bcdVersion = cpu_to_le32(1),
-+    .wIndex = cpu_to_le32(4),
-+    .bCount = cpu_to_le32(1),
-+    .Reserved = cpu_to_le32(0),
-+};
-+
-+static struct usb_os_desc_header os_prop_header = {
-+    .interface = cpu_to_le32(0),
-+    .dwLength = cpu_to_le32(sizeof(os_desc_header) + sizeof(struct usb_ext_prop_values)),
-+    .bcdVersion = cpu_to_le32(1),
-+    .wIndex = cpu_to_le32(5),
-+    .wCount = cpu_to_le16(1),
-+};
-+
- #define STR_INTERFACE_ "ADB Interface"
- 
- static const struct {
-@@ -151,8 +264,6 @@ static const struct {
-     },
- };
- 
--
--
- static void *usb_adb_open_thread(void *x)
- {
-     struct usb_handle *usb = (struct usb_handle *)x;
-@@ -270,6 +381,24 @@ static void usb_adb_init()
- static void init_functionfs(struct usb_handle *h)
- {
-     ssize_t ret;
-+    struct desc_v1 v1_descriptor = {};
-+    struct desc_v2 v2_descriptor = {};
-+
-+    v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2);
-+    v2_descriptor.header.length = cpu_to_le32(sizeof(v2_descriptor));
-+    v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC |
-+                                 FUNCTIONFS_HAS_SS_DESC | FUNCTIONFS_HAS_MS_OS_DESC;
-+    v2_descriptor.fs_count = 3;
-+    v2_descriptor.hs_count = 3;
-+    v2_descriptor.ss_count = 5;
-+    v2_descriptor.os_count = 2;
-+    v2_descriptor.fs_descs = fs_descriptors;
-+    v2_descriptor.hs_descs = hs_descriptors;
-+    v2_descriptor.ss_descs = ss_descriptors;
-+    v2_descriptor.os_header = os_desc_header;
-+    v2_descriptor.os_desc = os_desc_compat;
-+    v2_descriptor.os_prop_header = os_prop_header;
-+    v2_descriptor.os_prop_values.guid = os_desc_guid;
- 
-     if (h->control < 0) { // might have already done this before
-         D("OPENING %s\n", USB_FFS_ADB_EP0);
-@@ -279,10 +408,20 @@ static void init_functionfs(struct usb_handle *h)
-             goto err;
-         }
- 
--        ret = adb_write(h->control, &descriptors, sizeof(descriptors));
-+        ret = adb_write(h->control, &v2_descriptor, sizeof(v2_descriptor));
-         if (ret < 0) {
--            D("[ %s: write descriptors failed: errno=%d ]\n", USB_FFS_ADB_EP0, errno);
--            goto err;
-+            D("[ %s: write v2_descriptor failed: errno=%d ]\n", USB_FFS_ADB_EP0, errno);
-+            v1_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC);
-+            v1_descriptor.header.length = cpu_to_le32(sizeof(v1_descriptor));
-+            v1_descriptor.header.fs_count = 3;
-+            v1_descriptor.header.hs_count = 3;
-+            v1_descriptor.fs_descs = fs_descriptors;
-+            v1_descriptor.hs_descs = hs_descriptors;
-+           ret = adb_write(h->control, &v1_descriptor, sizeof(v1_descriptor));
-+           if (ret < 0) {
-+               D("[ %s: failed to write USB descriptors]\n", USB_FFS_ADB_EP0);
-+               goto err;
-+           }
-         }
- 
-         ret = adb_write(h->control, &strings, sizeof(strings));
--- 
-2.18.0
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch
deleted file mode 100644
index 5009c73a05..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7b74d23ed955206a789a96bdc3288593e702afac Mon Sep 17 00:00:00 2001
-From: Sean Anderson <sean.anderson@seco.com>
-Date: Thu, 30 Dec 2021 15:16:08 -0500
-Subject: [PATCH] libsparse: Split off most of sparse_file_read_normal into a
- helper function
-
-This carves out the core of sparse_file_read_normal and splits it off so
-it can be reused in the next patch. No functional change intended.
-
-Change-Id: Id00491fd7e5bb6fa28c517a0bb32b8b506539d4d
-Upstream-Status: Backport [95657f3e5976d96073f7bbfe3a49192509999d1d]
-Signed-off-by: Sean Anderson <sean.anderson@seco.com>
----
- libsparse/sparse_read.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c
-index 8e188e9a4..ee4abd86a 100644
---- a/libsparse/sparse_read.c
-+++ b/libsparse/sparse_read.c
-@@ -353,13 +353,11 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
-        return 0;
- }
- 
--static int sparse_file_read_normal(struct sparse_file *s, int fd)
-+static int do_sparse_file_read_normal(struct sparse_file *s, int fd, uint32_t* buf, int64_t offset,
-+                                     int64_t remain)
- {
-        int ret;
--       uint32_t *buf = malloc(s->block_size);
--       unsigned int block = 0;
--       int64_t remain = s->len;
--       int64_t offset = 0;
-+       unsigned int block = offset / s->block_size;
-        unsigned int to_read;
-        unsigned int i;
-        bool sparse_block;
-@@ -403,6 +401,19 @@ static int sparse_file_read_normal(struct sparse_file *s, int fd)
-        return 0;
- }
- 
-+static int sparse_file_read_normal(struct sparse_file* s, int fd)
-+{
-+       int ret;
-+       uint32_t* buf = (uint32_t*)malloc(s->block_size);
-+
-+       if (!buf)
-+               return -ENOMEM;
-+
-+       ret = do_sparse_file_read_normal(s, fd, buf, 0, s->len);
-+       free(buf);
-+       return ret;
-+}
-+
- int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc)
- {
-        if (crc && !sparse) {
--- 
-2.35.1.1320.gc452695387.dirty
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch
deleted file mode 100644
index e5221d2b4c..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From 41574b628ec4229c24dfe289af7b6978edcca4ed Mon Sep 17 00:00:00 2001
-From: Sean Anderson <sean.anderson@seco.com>
-Date: Thu, 30 Dec 2021 15:19:41 -0500
-Subject: [PATCH] libsparse: Add "hole" mode to sparse_file_read
-
-This adds support for filesystem-level sparse files. These files have
-holes which are not stored in the filesystem and when read are full of
-zeros. While these zeros may be significant in some types of files,
-other types of files may not care about the contents of holes. For
-example, most filesystem creation tools write to all the blocks they
-care about. Those blocks not written to will remain holes, and can be
-safely represented by "don't care" chunks. Using "don't care" chunks
-instead of fill chunks can result in a substantial reduction of the time
-it takes to program a sparse image.
-
-To accomplish this, we extend the existing "sparse" boolean parameter to
-be an enum of mode types. This enum represents the strategy we take when
-reading in a file. For the most part the implementation is
-straightforward. We use lseek to determine where the holes in the file
-are, and then use do_sparse_file_read_normal to create chunks for the
-data section. Note that every file has an implicit hole at its end.
-
-Change-Id: I0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
-Upstream-Status: Backport [f96466b05543b984ef7315d830bab4a409228d35]
-Signed-off-by: Sean Anderson <sean.anderson@seco.com>
----
- libsparse/img2simg.c              |  2 +-
- libsparse/include/sparse/sparse.h | 32 +++++++++++---
- libsparse/sparse_read.c           | 71 +++++++++++++++++++++++++++++--
- 3 files changed, 93 insertions(+), 12 deletions(-)
-
-diff --git a/libsparse/img2simg.c b/libsparse/img2simg.c
-index a0db36f45..2e171b613 100644
---- a/libsparse/img2simg.c
-+++ b/libsparse/img2simg.c
-@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
-        }
- 
-        sparse_file_verbose(s);
--       ret = sparse_file_read(s, in, false, false);
-+       ret = sparse_file_read(s, in, SPARSE_READ_MODE_NORMAL, false);
-        if (ret) {
-                fprintf(stderr, "Failed to read file\n");
-                exit(-1);
-diff --git a/libsparse/include/sparse/sparse.h b/libsparse/include/sparse/sparse.h
-index 8b757d22a..b68aa21a8 100644
---- a/libsparse/include/sparse/sparse.h
-+++ b/libsparse/include/sparse/sparse.h
-@@ -196,23 +196,41 @@ int64_t sparse_file_len(struct sparse_file *s, bool sparse, bool crc);
- int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc,
-                int (*write)(void *priv, const void *data, int len), void *priv);
- 
-+/**
-+ * enum sparse_read_mode - The method to use when reading in files
-+ * @SPARSE_READ_MODE_NORMAL: The input is a regular file. Constant chunks of
-+ *                           data (including holes) will be be converted to
-+ *                           fill chunks.
-+ * @SPARSE_READ_MODE_SPARSE: The input is an Android sparse file.
-+ * @SPARSE_READ_MODE_HOLE: The input is a regular file. Holes will be converted
-+ *                         to "don't care" chunks. Other constant chunks will
-+ *                         be converted to fill chunks.
-+ */
-+enum sparse_read_mode {
-+       SPARSE_READ_MODE_NORMAL = false,
-+       SPARSE_READ_MODE_SPARSE = true,
-+       SPARSE_READ_MODE_HOLE,
-+};
-+
- /**
-  * sparse_file_read - read a file into a sparse file cookie
-  *
-  * @s - sparse file cookie
-  * @fd - file descriptor to read from
-- * @sparse - read a file in the Android sparse file format
-+ * @mode - mode to use when reading the input file
-  * @crc - verify the crc of a file in the Android sparse file format
-  *
-- * Reads a file into a sparse file cookie.  If sparse is true, the file is
-- * assumed to be in the Android sparse file format.  If sparse is false, the
-- * file will be sparsed by looking for block aligned chunks of all zeros or
-- * another 32 bit value.  If crc is true, the crc of the sparse file will be
-- * verified.
-+ * Reads a file into a sparse file cookie. If @mode is
-+ * %SPARSE_READ_MODE_SPARSE, the file is assumed to be in the Android sparse
-+ * file format. If @mode is %SPARSE_READ_MODE_NORMAL, the file will be sparsed
-+ * by looking for block aligned chunks of all zeros or another 32 bit value. If
-+ * @mode is %SPARSE_READ_MODE_HOLE, the file will be sparsed like
-+ * %SPARSE_READ_MODE_NORMAL, but holes in the file will be converted to "don't
-+ * care" chunks. If crc is true, the crc of the sparse file will be verified.
-  *
-  * Returns 0 on success, negative errno on error.
-  */
--int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc);
-+int sparse_file_read(struct sparse_file *s, int fd, enum sparse_read_mode mode, bool crc);
- 
- /**
-  * sparse_file_import - import an existing sparse file
-diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c
-index ee4abd86a..81f48cc13 100644
---- a/libsparse/sparse_read.c
-+++ b/libsparse/sparse_read.c
-@@ -414,16 +414,79 @@ static int sparse_file_read_normal(struct sparse_file* s, int fd)
-        return ret;
- }
- 
--int sparse_file_read(struct sparse_file *s, int fd, bool sparse, bool crc)
-+#ifdef __linux__
-+static int sparse_file_read_hole(struct sparse_file* s, int fd)
- {
--       if (crc && !sparse) {
-+       int ret;
-+       uint32_t* buf = (uint32_t*)malloc(s->block_size);
-+       int64_t end = 0;
-+       int64_t start = 0;
-+
-+       if (!buf) {
-+               return -ENOMEM;
-+       }
-+
-+       do {
-+               start = lseek(fd, end, SEEK_DATA);
-+               if (start < 0) {
-+                       if (errno == ENXIO)
-+                               /* The rest of the file is a hole */
-+                               break;
-+
-+                       error("could not seek to data");
-+                       free(buf);
-+                       return -errno;
-+               } else if (start > s->len) {
-+                       break;
-+               }
-+
-+               end = lseek(fd, start, SEEK_HOLE);
-+               if (end < 0) {
-+                       error("could not seek to end");
-+                       free(buf);
-+                       return -errno;
-+               }
-+               end = min(end, s->len);
-+
-+               start = ALIGN_DOWN(start, s->block_size);
-+               end = ALIGN(end, s->block_size);
-+               if (lseek(fd, start, SEEK_SET) < 0) {
-+                       free(buf);
-+                       return -errno;
-+               }
-+
-+               ret = do_sparse_file_read_normal(s, fd, buf, start, end - start);
-+               if (ret) {
-+                       free(buf);
-+                       return ret;
-+               }
-+       } while (end < s->len);
-+
-+       free(buf);
-+       return 0;
-+}
-+#else
-+static int sparse_file_read_hole(struct sparse_file* s __unused, int fd __unused)
-+{
-+       return -ENOTSUP;
-+}
-+#endif
-+
-+int sparse_file_read(struct sparse_file *s, int fd, enum sparse_read_mode mode, bool crc)
-+{
-+       if (crc && mode != SPARSE_READ_MODE_SPARSE) {
-                return -EINVAL;
-        }
- 
--       if (sparse) {
-+       switch (mode) {
-+       case SPARSE_READ_MODE_SPARSE:
-                return sparse_file_read_sparse(s, fd, crc);
--       } else {
-+       case SPARSE_READ_MODE_NORMAL:
-                return sparse_file_read_normal(s, fd);
-+       case SPARSE_READ_MODE_HOLE:
-+               return sparse_file_read_hole(s, fd);
-+       default:
-+               return -EINVAL;
-        }
- }
- 
--- 
-2.35.1.1320.gc452695387.dirty
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch
deleted file mode 100644
index 9d19f58095..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 00cce57eff1a0de3b93efa5da225e9eb33d19659 Mon Sep 17 00:00:00 2001
-From: Sean Anderson <sean.anderson@seco.com>
-Date: Thu, 30 Dec 2021 15:34:28 -0500
-Subject: [PATCH] img2simg: Add support for converting holes to "don't care"
- chunks
-
-This adds support for converting files with holes to "don't care"
-chunks. This can result in a substantial reduction in the time it takes
-to program an image if it has many holes.
-
-Generally, constants compared to argc have been reduced by one, since we
-no longer have the program name as the first argument.
-
-Change-Id: I00750edc07d6415dcc07ae0351e9397b0222b7ba
-Upstream-Status: Backport [6150b00b6025918da8c28e5c2f929ecdf480a9d6]
-Signed-off-by: Sean Anderson <sean.anderson@seco.com>
----
- libsparse/img2simg.c | 41 ++++++++++++++++++++++++++++++-----------
- 1 file changed, 30 insertions(+), 11 deletions(-)
-
-diff --git a/libsparse/img2simg.c b/libsparse/img2simg.c
-index 2e171b613..c985d5449 100644
---- a/libsparse/img2simg.c
-+++ b/libsparse/img2simg.c
-@@ -40,25 +40,42 @@
- 
- void usage()
- {
--    fprintf(stderr, "Usage: img2simg <raw_image_file> <sparse_image_file> [<block_size>]\n");
-+    fprintf(stderr, "Usage: img2simg [-s] <raw_image_file> <sparse_image_file> [<block_size>]\n");
- }
- 
- int main(int argc, char *argv[])
- {
-+       char *arg_in;
-+       char *arg_out;
-+       enum sparse_read_mode mode = SPARSE_READ_MODE_NORMAL;
-+       int extra;
-        int in;
-+       int opt;
-        int out;
-        int ret;
-        struct sparse_file *s;
-        unsigned int block_size = 4096;
-        off64_t len;
- 
--       if (argc < 3 || argc > 4) {
-+       while ((opt = getopt(argc, argv, "s")) != -1) {
-+               switch (opt) {
-+               case 's':
-+                       mode = SPARSE_READ_MODE_HOLE;
-+                       break;
-+               default:
-+                       usage();
-+                       exit(-1);
-+               }
-+       }
-+
-+       extra = argc - optind;
-+       if (extra < 2 || extra > 3) {
-                usage();
-                exit(-1);
-        }
- 
--       if (argc == 4) {
--               block_size = atoi(argv[3]);
-+       if (extra == 3) {
-+               block_size = atoi(argv[optind + 2]);
-        }
- 
-        if (block_size < 1024 || block_size % 4 != 0) {
-@@ -66,22 +83,24 @@ int main(int argc, char *argv[])
-                exit(-1);
-        }
- 
--       if (strcmp(argv[1], "-") == 0) {
-+       arg_in = argv[optind];
-+       if (strcmp(arg_in, "-") == 0) {
-                in = STDIN_FILENO;
-        } else {
--               in = open(argv[1], O_RDONLY | O_BINARY);
-+               in = open(arg_in, O_RDONLY | O_BINARY);
-                if (in < 0) {
--                       fprintf(stderr, "Cannot open input file %s\n", argv[1]);
-+                       fprintf(stderr, "Cannot open input file %s\n", arg_in);
-                        exit(-1);
-                }
-        }
- 
--       if (strcmp(argv[2], "-") == 0) {
-+       arg_out = argv[optind + 1];
-+       if (strcmp(arg_out, "-") == 0) {
-                out = STDOUT_FILENO;
-        } else {
--               out = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
-+               out = open(arg_out, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0664);
-                if (out < 0) {
--                       fprintf(stderr, "Cannot open output file %s\n", argv[2]);
-+                       fprintf(stderr, "Cannot open output file %s\n", arg_out);
-                        exit(-1);
-                }
-        }
-@@ -96,7 +115,7 @@ int main(int argc, char *argv[])
-        }
- 
-        sparse_file_verbose(s);
--       ret = sparse_file_read(s, in, SPARSE_READ_MODE_NORMAL, false);
-+       ret = sparse_file_read(s, in, mode, false);
-        if (ret) {
-                fprintf(stderr, "Failed to read file\n");
-                exit(-1);
--- 
-2.35.1.1320.gc452695387.dirty
-
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
deleted file mode 100644
index ddb41ea4b0..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: adb: Make compatible with openssl 1.1
- OpenSSL version 1.1 brought some API changes which broke the build here,
- fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead.
-Author: Chirayu Desai <chirayudesai1@gmail.com
-Last-Update: 2016-11-10
----
-Upstream-Status: Pending
-
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
-Upstream-Status: Pending
-
- system/core/adb/adb_auth_host.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/adb/adb_auth_host.c
-+++ b/adb/adb_auth_host.c
-@@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
-     BIGNUM* rem = BN_new();
--    BIGNUM* n = BN_new();
-+    const BIGNUM* n;
-     BIGNUM* n0inv = BN_new();
-+    const BIGNUM* e;
- 
-     if (RSA_size(rsa) != RSANUMBYTES) {
-         ret = 0;
-@@ -82,7 +83,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
-     }
- 
-     BN_set_bit(r32, 32);
--    BN_copy(n, rsa->n);
-+    RSA_get0_key(rsa, &n, &e, NULL);
-     BN_set_bit(r, RSANUMWORDS * 32);
-     BN_mod_sqr(rr, r, n, ctx);
-     BN_div(NULL, rem, n, r32, ctx);
-@@ -96,11 +97,10 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
-         BN_div(n, rem, n, r32, ctx);
-         pkey->n[i] = BN_get_word(rem);
-     }
--    pkey->exponent = BN_get_word(rsa->e);
-+    pkey->exponent = BN_get_word(e);
- 
- out:
-     BN_free(n0inv);
--    BN_free(n);
-     BN_free(rem);
-     BN_free(r);
-     BN_free(rr);
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/b64_pton_function_decl.patch b/meta-oe/recipes-devtools/android-tools/android-tools/core/b64_pton_function_decl.patch
deleted file mode 100644
index 80410f1d2b..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/b64_pton_function_decl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Add protoype declaration for  b64_pton
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/adb/adb_auth_client.c
-+++ b/adb/adb_auth_client.c
-@@ -29,6 +29,7 @@
- 
- #define TRACE_TAG TRACE_AUTH
- 
-+extern int b64_pton(const char* src, uint8_t* target, size_t targsize);
- 
- struct adb_public_key {
-     struct listnode node;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-notifying-systemd.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-notifying-systemd.patch
new file mode 100644
index 0000000000..a5caf39c80
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-notifying-systemd.patch
@@ -0,0 +1,41 @@
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Fri, 30 Sep 2022 16:54:02 +0200
+Subject: adb: daemon: allow notifying systemd when ready
+
+When using `systemd` on Linux, we should allow `adbd` to notify
+`systemd` once it has started and configured its USB/network interface.
+This allows us to (for example) wait for the daemon to bind to the
+FunctionFS endpoints, then activate the USB gadget.
+
+Forwarded: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2238429
+Upstream-Status: Inappropriate [Debian-specific]
+---
+ packages/modules/adb/daemon/main.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index d1b999b..deba593 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -49,6 +49,10 @@
+ #include "selinux/android.h"
+ #endif
+ 
++#if defined(__linux__)
++#include <systemd/sd-daemon.h>
++#endif
++
+ #include "adb.h"
+ #include "adb_auth.h"
+ #include "adb_listeners.h"
+@@ -302,6 +306,10 @@ int adbd_main(int server_port) {
+     init_jdwp();
+     D("adbd_main(): post init_jdwp()");
+ 
++#if defined(__linux__)
++    sd_notify(1, "READY=1");
++#endif
++
+     D("Event loop starting");
+     fdevent_loop();
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-usb-on-linux.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-usb-on-linux.patch
new file mode 100644
index 0000000000..76e2427fc2
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-allow-usb-on-linux.patch
@@ -0,0 +1,28 @@
+From: Julien Massot <julien.massot@collabora.com>
+Date: Mon, 5 Sep 2022 16:00:12 +0200
+Subject: adb: daemon: allow binding to USB on Linux systems
+
+Linux systems are also capable of using FunctionFS for USB gadget
+configurations. This requires creating a specific gadget configuration
+using ConfigFS (including an `ffs.adb` function) and mounting
+FunctionFS to `/dev/usb-ffs/adb`.
+
+Forwarded: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2238428
+Upstream-Status: Inappropriate [Debian-specific]
+---
+ packages/modules/adb/daemon/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index 188272a..6c949c1 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -251,7 +251,7 @@ int adbd_main(int server_port) {
+ 
+     bool is_usb = false;
+ 
+-#if defined(__ANDROID__)
++#if defined(__linux__)
+     if (access(USB_FFS_ADB_EP0, F_OK) == 0) {
+         // Listen on USB.
+         usb_init();
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-don-t-require-authorization-on-Linux.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-don-t-require-authorization-on-Linux.patch
new file mode 100644
index 0000000000..5d3ed124bc
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-don-t-require-authorization-on-Linux.patch
@@ -0,0 +1,27 @@
+From 2427e520751b13a6e0a409f427f1ec9b23e63447 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Wed, 3 May 2023 18:36:06 +0200
+Subject: [PATCH] adb: daemon: don't require authorization on Linux
+
+Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Upstream-Status: Inappropriate [Debian-specific]
+---
+ packages/modules/adb/daemon/main.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/packages/modules/adb/daemon/main.cpp b/packages/modules/adb/daemon/main.cpp
+index 188272ae3..02a57f4e2 100644
+--- a/packages/modules/adb/daemon/main.cpp
++++ b/packages/modules/adb/daemon/main.cpp
+@@ -224,6 +224,8 @@ int adbd_main(int server_port) {
+         auth_required = android::base::GetBoolProperty("ro.adb.secure", false);
+ #endif
+     }
++#else
++    auth_required = false;
+ #endif
+ 
+     // Our external storage path may be different than apps, since
+-- 
+2.39.2
+
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-usb-drop-property-monitor.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-usb-drop-property-monitor.patch
new file mode 100644
index 0000000000..0f1d3f7a6f
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-adbd-adbd-usb-drop-property-monitor.patch
@@ -0,0 +1,57 @@
+From ba56ee6f092601932f9146eeb4f8b057da157be2 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Tue, 2 May 2023 17:16:22 +0200
+Subject: [PATCH] adb: daemon: usb: drop property monitor
+
+This is an Android-only feature not available on Linux.
+Upstream-Status: Inappropriate [Debian-specific]
+---
+ packages/modules/adb/daemon/usb.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/packages/modules/adb/daemon/usb.cpp b/packages/modules/adb/daemon/usb.cpp
+index ec22f6661..e904a7629 100644
+--- a/packages/modules/adb/daemon/usb.cpp
++++ b/packages/modules/adb/daemon/usb.cpp
+@@ -48,7 +48,9 @@
+ 
+ #include "adb_unique_fd.h"
+ #include "adb_utils.h"
++#if defined(__ANDROID__)
+ #include "daemon/property_monitor.h"
++#endif
+ #include "daemon/usb_ffs.h"
+ #include "sysdeps/chrono.h"
+ #include "transfer_id.h"
+@@ -744,6 +746,7 @@ struct UsbFfsConnection : public Connection {
+ static void usb_ffs_open_thread() {
+     adb_thread_setname("usb ffs open");
+ 
++#if defined(__ANDROID__)
+     // When the device is acting as a USB host, we'll be unable to bind to the USB gadget on kernels
+     // that don't carry a downstream patch to enable that behavior.
+     //
+@@ -757,6 +760,7 @@ static void usb_ffs_open_thread() {
+         // Return false (i.e. break out of PropertyMonitor::Run) when the property != 1.
+         return android::base::ParseBool(value) == android::base::ParseBoolResult::kTrue;
+     });
++#endif
+ 
+     while (true) {
+         unique_fd control;
+@@ -767,11 +771,13 @@ static void usb_ffs_open_thread() {
+             continue;
+         }
+ 
++#if defined(__ANDROID__)
+         if (android::base::GetBoolProperty(kPropertyUsbDisabled, false)) {
+             LOG(INFO) << "pausing USB due to " << kPropertyUsbDisabled;
+             prop_mon.Run();
+             LOG(INFO) << "resuming USB";
+         }
++#endif
+ 
+         atransport* transport = new atransport();
+         transport->serial = "UsbFfs";
+-- 
+2.39.2
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-dev-typos.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-dev-typos.patch
new file mode 100644
index 0000000000..2ac7d66bd4
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-dev-typos.patch
@@ -0,0 +1,16 @@
+Description: Fix typos
+Author: Kai-Chung Yan (殷啟聰)
+Last-Update: 2016-10-01
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/development/tools/etc1tool/etc1tool.cpp
++++ b/development/tools/etc1tool/etc1tool.cpp
+@@ -56,7 +56,7 @@
+             "\t\t                             image to difffile. (Only valid when encoding).\n");
+     fprintf(stderr,
+             "\tIf outfile is not specified, an outfile path is constructed from infile,\n");
+-    fprintf(stderr, "\twith the apropriate suffix (.pkm or .png).\n");
++    fprintf(stderr, "\twith the appropriate suffix (.pkm or .png).\n");
+     exit(1);
+ }
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-Nullable.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-Nullable.patch
new file mode 100644
index 0000000000..e9a9a91bfb
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-Nullable.patch
@@ -0,0 +1,14 @@
+Description: Bring Clang's _Nullable keyword to GCC
+ This patch is for gcc only, no need for clang.
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/libnativehelper/file_descriptor_jni.c
++++ b/libnativehelper/file_descriptor_jni.c
+@@ -22,6 +22,7 @@
+ #include "ALog-priv.h"
+ 
+ #include "JniConstants.h"
++#define _Nullable
+ 
+ static void EnsureArgumentIsFileDescriptor(JNIEnv* env, jobject instance) {
+     ALOG_ALWAYS_FATAL_IF(instance == NULL, "FileDescriptor is NULL");
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-stdatomic.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-stdatomic.patch
new file mode 100644
index 0000000000..ed670eacf4
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-stdatomic.patch
@@ -0,0 +1,68 @@
+Description: Fix incompatibility between <stdatomic.h> and <atomic>
+ This 2 headers combined will cause errors for both GCC and Clang. This patch
+ makes sure only one of them is present at any time.
+ .
+ This patch is for gcc only, no need for clang.
+Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932
+Bug: https://reviews.llvm.org/D45470
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/core/libcutils/include/cutils/atomic.h
++++ b/system/core/libcutils/include/cutils/atomic.h
+@@ -19,7 +19,23 @@
+ 
+ #include <stdint.h>
+ #include <sys/types.h>
++#ifdef __cplusplus
++#include <atomic>
++using std::atomic_compare_exchange_strong_explicit;
++using std::atomic_fetch_add_explicit;
++using std::atomic_fetch_or_explicit;
++using std::atomic_fetch_sub_explicit;
++using std::atomic_int_least32_t;
++using std::atomic_load_explicit;
++using std::atomic_store_explicit;
++using std::atomic_thread_fence;
++using std::memory_order::memory_order_acquire;
++using std::memory_order::memory_order_relaxed;
++using std::memory_order::memory_order_release;
++using std::memory_order::memory_order_seq_cst;
++#else
+ #include <stdatomic.h>
++#endif
+ 
+ #ifndef ANDROID_ATOMIC_INLINE
+ #define ANDROID_ATOMIC_INLINE static inline
+--- a/system/core/libcutils/include/cutils/trace.h
++++ b/system/core/libcutils/include/cutils/trace.h
+@@ -18,7 +18,14 @@
+ #define _LIBS_CUTILS_TRACE_H
+ 
+ #include <inttypes.h>
++#ifdef __cplusplus
++#include <atomic>
++using std::atomic_bool;
++using std::atomic_load_explicit;
++using std::memory_order_acquire;
++#else
+ #include <stdatomic.h>
++#endif
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>
+--- a/system/logging/liblog/logger.h
++++ b/system/logging/liblog/logger.h
+@@ -16,7 +16,13 @@
+ 
+ #pragma once
+ 
++#ifdef __cplusplus
++#include <atomic>
++using std::atomic_int;
++using std::atomic_uintptr_t;
++#else
+ #include <stdatomic.h>
++#endif
+ #include <sys/cdefs.h>
+ 
+ #include <log/log.h>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-workaround__builtin_available.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-workaround__builtin_available.patch
new file mode 100644
index 0000000000..60ca08cc24
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-gcc-workaround__builtin_available.patch
@@ -0,0 +1,148 @@
+Description: Workaround Clang's __builtin_available keyword
+ This patch is for gcc only, no need for clang.
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/libbase/logging.cpp
++++ b/system/libbase/logging.cpp
+@@ -209,8 +209,9 @@ static std::recursive_mutex& TagLock() {
+ static std::string* gDefaultTag;
+ 
+ void SetDefaultTag(const std::string& tag) {
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_set_default_tag(tag.c_str());
++#if 0
+   } else {
+     std::lock_guard<std::recursive_mutex> lock(TagLock());
+     if (gDefaultTag != nullptr) {
+@@ -221,6 +222,7 @@ void SetDefaultTag(const std::string& tag) {
+       gDefaultTag = new std::string(tag);
+     }
+   }
++#endif
+ }
+ 
+ static bool gInitialized = false;
+@@ -314,13 +316,15 @@ static void LogdLogChunk(LogId id, LogSeverity severity, const char* tag, const
+   int32_t lg_id = LogIdTolog_id_t(id);
+   int32_t priority = LogSeverityToPriority(severity);
+ 
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_message log_message = {sizeof(__android_log_message),     lg_id, priority, tag,
+                                          static_cast<const char*>(nullptr), 0,     message};
+     __android_log_logd_logger(&log_message);
++#if 0
+   } else {
+     __android_log_buf_print(lg_id, priority, tag, "%s", message);
+   }
++#endif
+ }
+ 
+ LogdLogger::LogdLogger(LogId default_log_id) : default_log_id_(default_log_id) {}
+@@ -396,7 +400,7 @@ LogFunction SetLogger(LogFunction&& logger) {
+   LogFunction old_logger = std::move(Logger());
+   Logger() = std::move(logger);
+ 
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_set_logger([](const struct __android_log_message* log_message) {
+       auto log_id = log_id_tToLogId(log_message->buffer_id);
+       auto severity = PriorityToLogSeverity(log_message->priority);
+@@ -404,7 +408,7 @@ LogFunction SetLogger(LogFunction&& logger) {
+       Logger()(log_id, severity, log_message->tag, log_message->file, log_message->line,
+                log_message->message);
+     });
+-  }
++//  }
+   return old_logger;
+ }
+ 
+@@ -412,9 +416,9 @@ AbortFunction SetAborter(AbortFunction&& aborter) {
+   AbortFunction old_aborter = std::move(Aborter());
+   Aborter() = std::move(aborter);
+ 
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_set_aborter([](const char* abort_message) { Aborter()(abort_message); });
+-  }
++//  }
+   return old_aborter;
+ }
+ 
+@@ -500,11 +504,13 @@ LogMessage::~LogMessage() {
+ 
+   // Abort if necessary.
+   if (data_->GetSeverity() == FATAL) {
+-    if (__builtin_available(android 30, *)) {
++//    if (__builtin_available(android 30, *)) {
+       __android_log_call_aborter(msg.c_str());
++#if 0
+     } else {
+       Aborter()(msg.c_str());
+     }
++#endif
+   }
+ }
+ 
+@@ -515,10 +521,11 @@ std::ostream& LogMessage::stream() {
+ void LogMessage::LogLine(const char* file, unsigned int line, LogSeverity severity, const char* tag,
+                          const char* message) {
+   int32_t priority = LogSeverityToPriority(severity);
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     __android_log_message log_message = {
+         sizeof(__android_log_message), LOG_ID_DEFAULT, priority, tag, file, line, message};
+     __android_log_write_log_message(&log_message);
++#if 0
+   } else {
+     if (tag == nullptr) {
+       std::lock_guard<std::recursive_mutex> lock(TagLock());
+@@ -531,37 +538,44 @@ void LogMessage::LogLine(const char* file, unsigned int line, LogSeverity severi
+       Logger()(DEFAULT, severity, tag, file, line, message);
+     }
+   }
++#endif
+ }
+ 
+ LogSeverity GetMinimumLogSeverity() {
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     return PriorityToLogSeverity(__android_log_get_minimum_priority());
++#if 0
+   } else {
+     return gMinimumLogSeverity;
+   }
++#endif
+ }
+ 
+ bool ShouldLog(LogSeverity severity, const char* tag) {
+   // Even though we're not using the R liblog functions in this function, if we're running on Q,
+   // we need to fall back to using gMinimumLogSeverity, since __android_log_is_loggable() will not
+   // take into consideration the value from SetMinimumLogSeverity().
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     int32_t priority = LogSeverityToPriority(severity);
+     return __android_log_is_loggable(priority, tag, ANDROID_LOG_INFO);
++#if 0
+   } else {
+     return severity >= gMinimumLogSeverity;
+   }
++#endif
+ }
+ 
+ LogSeverity SetMinimumLogSeverity(LogSeverity new_severity) {
+-  if (__builtin_available(android 30, *)) {
++//  if (__builtin_available(android 30, *)) {
+     int32_t priority = LogSeverityToPriority(new_severity);
+     return PriorityToLogSeverity(__android_log_set_minimum_priority(priority));
++#if 0
+   } else {
+     LogSeverity old_severity = gMinimumLogSeverity;
+     gMinimumLogSeverity = new_severity;
+     return old_severity;
+   }
++#endif
+ }
+ 
+ ScopedLogSeverity::ScopedLogSeverity(LogSeverity new_severity) {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Added-missing-headers.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Added-missing-headers.patch
new file mode 100644
index 0000000000..38ff305870
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Added-missing-headers.patch
@@ -0,0 +1,15 @@
+Description: Added missing headers causing compile errors
+Author: Umang Parmar <umangjparmar@gmail.com>
+Forwarded: not-needed
+
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/pairing_connection/pairing_server.cpp
++++ b/packages/modules/adb/pairing_connection/pairing_server.cpp
+@@ -20,6 +20,7 @@
+ #include <sys/eventfd.h>
+ 
+ #include <atomic>
++#include <condition_variable>
+ #include <deque>
+ #include <iomanip>
+ #include <mutex>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Drop-gki-dependency-from-mkbootimg.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Drop-gki-dependency-from-mkbootimg.patch
new file mode 100644
index 0000000000..6b940df707
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Drop-gki-dependency-from-mkbootimg.patch
@@ -0,0 +1,114 @@
+Description: Drop gki dependency from mkbootimg
+ `mkbootimg` is currently unusable due to a missing `gki` python
+ module. This module is only needed for signing GKI boot images, which
+ is deprecated as the argument group description implies.
+ This patch disables this (deprecated) signature feature entirely as
+ it's unlikely Debian users will actually need it.
+Author: Arnaud Ferraris <aferraris@debian.org>
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/tools/mkbootimg/mkbootimg.py
++++ b/system/tools/mkbootimg/mkbootimg.py
+@@ -28,8 +28,6 @@ import os
+ import re
+ import tempfile
+ 
+-from gki.generate_gki_certificate import generate_gki_certificate
+-
+ # Constant and structure definition is in
+ # system/tools/mkbootimg/include/bootimg/bootimg.h
+ BOOT_MAGIC = 'ANDROID!'
+@@ -105,12 +103,6 @@ def get_recovery_dtbo_offset(args):
+     return dtbo_offset
+ 
+ 
+-def should_add_legacy_gki_boot_signature(args):
+-    if args.gki_signing_key and args.gki_signing_algorithm:
+-        return True
+-    return False
+-
+-
+ def write_header_v3_and_above(args):
+     if args.header_version > 3:
+         boot_header_size = BOOT_IMAGE_HEADER_V4_SIZE
+@@ -134,8 +126,6 @@ def write_header_v3_and_above(args):
+     if args.header_version >= 4:
+         # The signature used to verify boot image v4.
+         boot_signature_size = 0
+-        if should_add_legacy_gki_boot_signature(args):
+-            boot_signature_size = BOOT_IMAGE_V4_SIGNATURE_SIZE
+         args.output.write(pack('I', boot_signature_size))
+     pad_file(args.output, BOOT_IMAGE_HEADER_V3_PAGESIZE)
+ 
+@@ -549,19 +539,6 @@ def parse_cmdline():
+     parser.add_argument('--vendor_bootconfig', type=FileType('rb'),
+                         help='path to the vendor bootconfig file')
+ 
+-    gki_2_0_signing_args = parser.add_argument_group(
+-        '[DEPRECATED] GKI 2.0 signing arguments')
+-    gki_2_0_signing_args.add_argument(
+-        '--gki_signing_algorithm', help='GKI signing algorithm to use')
+-    gki_2_0_signing_args.add_argument(
+-        '--gki_signing_key', help='path to RSA private key file')
+-    gki_2_0_signing_args.add_argument(
+-        '--gki_signing_signature_args', default='',
+-        help='other hash arguments passed to avbtool')
+-    gki_2_0_signing_args.add_argument(
+-        '--gki_signing_avbtool_path', default='avbtool',
+-        help='path to avbtool for boot signature generation')
+-
+     args, extra_args = parser.parse_known_args()
+     if args.vendor_boot is not None and args.header_version > 3:
+         extra_args = parse_vendor_ramdisk_args(args, extra_args)
+@@ -577,42 +554,6 @@ def parse_cmdline():
+     return args
+ 
+ 
+-def add_boot_image_signature(args, pagesize):
+-    """Adds the boot image signature.
+-
+-    Note that the signature will only be verified in VTS to ensure a
+-    generic boot.img is used. It will not be used by the device
+-    bootloader at boot time. The bootloader should only verify
+-    the boot vbmeta at the end of the boot partition (or in the top-level
+-    vbmeta partition) via the Android Verified Boot process, when the
+-    device boots.
+-    """
+-    # Flush the buffer for signature calculation.
+-    args.output.flush()
+-
+-    # Outputs the signed vbmeta to a separate file, then append to boot.img
+-    # as the boot signature.
+-    with tempfile.TemporaryDirectory() as temp_out_dir:
+-        boot_signature_output = os.path.join(temp_out_dir, 'boot_signature')
+-        generate_gki_certificate(
+-            image=args.output.name, avbtool=args.gki_signing_avbtool_path,
+-            name='boot', algorithm=args.gki_signing_algorithm,
+-            key=args.gki_signing_key, salt='d00df00d',
+-            additional_avb_args=args.gki_signing_signature_args.split(),
+-            output=boot_signature_output,
+-        )
+-        with open(boot_signature_output, 'rb') as boot_signature:
+-            boot_signature_bytes = boot_signature.read()
+-            if len(boot_signature_bytes) > BOOT_IMAGE_V4_SIGNATURE_SIZE:
+-                raise ValueError(
+-                    f'boot sigature size is > {BOOT_IMAGE_V4_SIGNATURE_SIZE}')
+-            boot_signature_bytes += b'\x00' * (
+-                BOOT_IMAGE_V4_SIGNATURE_SIZE - len(boot_signature_bytes))
+-            assert len(boot_signature_bytes) == BOOT_IMAGE_V4_SIGNATURE_SIZE
+-            args.output.write(boot_signature_bytes)
+-            pad_file(args.output, pagesize)
+-
+-
+ def write_data(args, pagesize):
+     write_padded_file(args.output, args.kernel, pagesize)
+     write_padded_file(args.output, args.ramdisk, pagesize)
+@@ -622,8 +563,6 @@ def write_data(args, pagesize):
+         write_padded_file(args.output, args.recovery_dtbo, pagesize)
+     if args.header_version == 2:
+         write_padded_file(args.output, args.dtb, pagesize)
+-    if args.header_version >= 4 and should_add_legacy_gki_boot_signature(args):
+-        add_boot_image_signature(args, pagesize)
+ 
+ 
+ def write_vendor_boot_data(args):
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Implement-const_iterator-operator.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Implement-const_iterator-operator.patch
new file mode 100644
index 0000000000..4679edd537
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-Implement-const_iterator-operator.patch
@@ -0,0 +1,37 @@
+Description: Implement const_iterator::operator--
+Forwarded: not-needed
+
+Needed for
+android-platform-frameworks-base/libs/androidfw/LoadedArsc.cpp
+when compiling against libstdc++.
+Upstream-Status: Inappropriate [Debian-specific]
+---
+--- a/system/incremental_delivery/incfs/util/include/util/map_ptr.h
++++ b/system/incremental_delivery/incfs/util/include/util/map_ptr.h
+@@ -180,6 +180,11 @@ public:
+             return *this;
+         }
+ 
++        const const_iterator& operator--() {
++            safe_ptr_--;
++            return *this;
++        }
++
+         const_iterator& operator+=(int n) {
+             safe_ptr_ = safe_ptr_ + n;
+             return *this;
+@@ -321,6 +326,14 @@ public:
+         return temp;
+     }
+ 
++    template <typename T1 = T, NotVoid<T1> = 0>
++    const map_ptr<T1> operator--(int) {
++        map_ptr<T1> temp = *this;
++        LIBINCFS_MAP_PTR_DEBUG_CODE(verified_ = false);
++        --ptr_;
++        return temp;
++    }
++
+     template <typename S, typename T1 = T, NotVoid<T1> = 0>
+     map_ptr<T1> operator+(const S n) const {
+         return map_ptr<T1>(map_, ptr_ + n, verified_block_);
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-add-missing-headers.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-add-missing-headers.patch
new file mode 100644
index 0000000000..b0bac72320
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-add-missing-headers.patch
@@ -0,0 +1,13 @@
+Description: add missing headers
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/core/fastboot/fastboot_driver_interface.h
++++ b/system/core/fastboot/fastboot_driver_interface.h
+@@ -17,6 +17,7 @@
+ 
+ #include <string>
+ 
++#include <stdint.h>
+ #include "android-base/unique_fd.h"
+ 
+ class Transport;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-hard-code-build-number.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-hard-code-build-number.patch
new file mode 100644
index 0000000000..7555ba6406
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-hard-code-build-number.patch
@@ -0,0 +1,57 @@
+Description: just hard code rather than deal with circular deps
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/adb.cpp
++++ b/packages/modules/adb/adb.cpp
+@@ -47,9 +47,6 @@
+ #include <android-base/utf8.h>
+ #include <diagnose_usb.h>
+ 
+-#include <build/version.h>
+-#include <platform_tools_version.h>
+-
+ #include "adb_auth.h"
+ #include "adb_io.h"
+ #include "adb_listeners.h"
+@@ -100,7 +97,7 @@
+             "Installed as %s\n"
+             "Running on %s\n",
+             ADB_VERSION_MAJOR, ADB_VERSION_MINOR, ADB_SERVER_VERSION, PLATFORM_TOOLS_VERSION,
+-            android::build::GetBuildNumber().c_str(), android::base::GetExecutablePath().c_str(),
++            "debian", android::base::GetExecutablePath().c_str(),
+             GetOSVersion().c_str());
+ }
+ 
+@@ -1339,7 +1339,7 @@ HostRequestResult handle_host_request(std::string_view service, TransportType ty
+         status.set_mdns_backend_forced(getenv("ADB_MDNS_OPENSCREEN") != nullptr);
+ 
+         status.set_version(std::string(PLATFORM_TOOLS_VERSION));
+-        status.set_build(android::build::GetBuildNumber());
++        status.set_build("debian");
+         status.set_executable_absolute_path(android::base::GetExecutablePath());
+         status.set_log_absolute_path(GetLogFilePath());
+         status.set_os(GetOSVersion());
+--- a/system/core/fastboot/fastboot.cpp
++++ b/system/core/fastboot/fastboot.cpp
+@@ -64,11 +64,9 @@
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
+ #include <android-base/unique_fd.h>
+-#include <build/version.h>
+ #include <libavb/libavb.h>
+ #include <liblp/liblp.h>
+ #include <liblp/super_layout_builder.h>
+-#include <platform_tools_version.h>
+ #include <sparse/sparse.h>
+ #include <ziparchive/zip_archive.h>
+ 
+@@ -1962,8 +1960,7 @@
+                 setvbuf(stdout, nullptr, _IONBF, 0);
+                 setvbuf(stderr, nullptr, _IONBF, 0);
+             } else if (name == "version") {
+-                fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION,
+-                        android::build::GetBuildNumber().c_str());
++                fprintf(stdout, "fastboot version %s-%s\n", PLATFORM_TOOLS_VERSION, "debian");
+                 fprintf(stdout, "Installed as %s\n", android::base::GetExecutablePath().c_str());
+                 return 0;
+             } else {
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-libusb-header-path.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-libusb-header-path.patch
new file mode 100644
index 0000000000..9a15ec1a19
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-libusb-header-path.patch
@@ -0,0 +1,17 @@
+Description: libusb.h comes from different location
+Author: Umang Parmar <umangjparmar@gmail.com>
+Forwarded: not-needed
+Last-Update: 2018-05-26
+
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/client/usb_libusb.cpp
++++ b/packages/modules/adb/client/usb_libusb.cpp
+@@ -36,7 +36,7 @@
+ #include <unordered_map>
+ #include <vector>
+ 
+-#include <libusb/libusb.h>
++#include <libusb-1.0/libusb.h>
+ 
+ #include <android-base/file.h>
+ #include <android-base/logging.h>
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-move-log-file-to-proper-dir.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-move-log-file-to-proper-dir.patch
new file mode 100644
index 0000000000..201ec62bca
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-move-log-file-to-proper-dir.patch
@@ -0,0 +1,19 @@
+Description: Update log file directory.
+Author: Umang Parmar <umangjparmar@gmail.com>
+Last Updated: 2018-05-17
+
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/adb_utils.cpp
++++ b/packages/modules/adb/adb_utils.cpp
+@@ -343,6 +343,11 @@
+ 
+     return temp_path_utf8 + log_name;
+ #else
++    std::string log_dir = android::base::StringPrintf("/run/user/%u/adb.log", getuid());
++    struct stat st = {0};
++    if (stat(log_dir.c_str(), &st) == 0) {
++      return log_dir;
++    }
+     const char* tmp_dir = getenv("TMPDIR");
+     if (tmp_dir == nullptr) tmp_dir = "/tmp";
+     return android::base::StringPrintf("%s/adb.%u.log", tmp_dir, getuid());
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-stub-out-fastdeploy.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-stub-out-fastdeploy.patch
new file mode 100644
index 0000000000..fb16cff79a
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-stub-out-fastdeploy.patch
@@ -0,0 +1,99 @@
+Description: Defer packaging fastdeploy with adb for 29.x.x tags.
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/packages/modules/adb/client/adb_install.cpp
++++ b/packages/modules/adb/client/adb_install.cpp
+@@ -185,14 +185,6 @@
+     }
+ 
+     if (use_fastdeploy) {
+-        auto metadata = extract_metadata(file);
+-        if (metadata.has_value()) {
+-            // pass all but 1st (command) and last (apk path) parameters through to pm for
+-            // session creation
+-            std::vector<const char*> pm_args{argv + 1, argv + argc - 1};
+-            auto patchFd = install_patch(pm_args.size(), pm_args.data());
+-            return stream_patch(file, std::move(metadata.value()), std::move(patchFd));
+-        }
+     }
+ 
+     struct stat sb;
+@@ -280,16 +272,6 @@
+     argv[last_apk] = apk_dest.c_str(); /* destination name, not source location */
+ 
+     if (use_fastdeploy) {
+-        auto metadata = extract_metadata(apk_file[0]);
+-        if (metadata.has_value()) {
+-            auto patchFd = apply_patch_on_device(apk_dest.c_str());
+-            int status = stream_patch(apk_file[0], std::move(metadata.value()), std::move(patchFd));
+-
+-            result = pm_command(argc, argv);
+-            delete_device_file(apk_dest);
+-
+-            return status;
+-        }
+     }
+ 
+     if (do_sync_push(apk_file, apk_dest.c_str(), false, CompressionType::Any, false, false)) {
+@@ -457,7 +439,6 @@
+         std::vector<const char*> argv, bool* use_fastdeploy,
+         FastDeploy_AgentUpdateStrategy* agent_update_strategy) {
+     *use_fastdeploy = false;
+-    *agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion;
+ 
+     std::vector<const char*> passthrough;
+     for (auto&& arg : argv) {
+@@ -466,11 +447,8 @@
+         } else if (arg == "--no-fastdeploy"sv) {
+             *use_fastdeploy = false;
+         } else if (arg == "--force-agent"sv) {
+-            *agent_update_strategy = FastDeploy_AgentUpdateAlways;
+         } else if (arg == "--date-check-agent"sv) {
+-            *agent_update_strategy = FastDeploy_AgentUpdateNewerTimeStamp;
+         } else if (arg == "--version-check-agent"sv) {
+-            *agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion;
+         } else {
+             passthrough.push_back(arg);
+         }
+@@ -484,12 +462,11 @@
+     bool incremental_wait = false;
+ 
+     bool use_fastdeploy = false;
+-    FastDeploy_AgentUpdateStrategy agent_update_strategy = FastDeploy_AgentUpdateDifferentVersion;
+ 
+     auto unused_argv = parse_install_mode({argv, argv + argc}, &install_mode, &incremental_request,
+                                           &incremental_wait);
+     auto passthrough_argv =
+-            parse_fast_deploy_mode(std::move(unused_argv), &use_fastdeploy, &agent_update_strategy);
++            parse_fast_deploy_mode(std::move(unused_argv), &use_fastdeploy, nullptr);
+ 
+     auto [primary_mode, fallback_mode] =
+             calculate_install_mode(install_mode, use_fastdeploy, incremental_request);
+@@ -499,14 +476,11 @@
+         error_exit("Attempting to use streaming install on unsupported device");
+     }
+ 
+-    if (use_fastdeploy && get_device_api_level() < kFastDeployMinApi) {
+-        fprintf(stderr,
+-                "Fast Deploy is only compatible with devices of API version %d or higher, "
+-                "ignoring.\n",
+-                kFastDeployMinApi);
++    if (use_fastdeploy) {
++        printf("Fast Deploy is unavailable in this build of adb, "
++               "ignoring.\n");
+         use_fastdeploy = false;
+     }
+-    fastdeploy_set_agent_update_strategy(agent_update_strategy);
+ 
+     if (passthrough_argv.size() < 2) {
+         error_exit("install requires an apk argument");
+--- a/packages/modules/adb/client/commandline.cpp
++++ b/packages/modules/adb/client/commandline.cpp
+@@ -63,7 +63,6 @@
+ #include "bugreport.h"
+ #include "client/file_sync_client.h"
+ #include "commandline.h"
+-#include "fastdeploy.h"
+ #include "incremental_server.h"
+ #include "services.h"
+ #include "shell_protocol.h"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-throw-exception-on-unknown-os.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-throw-exception-on-unknown-os.patch
new file mode 100644
index 0000000000..2e254e0d46
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-throw-exception-on-unknown-os.patch
@@ -0,0 +1,17 @@
+Description: Turn #error into exceptions
+ So the library can be built on non-Linux platforms too, although can't
+ guarauntee its functionality regarding that piece of code.
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/libbase/file.cpp
++++ b/system/libbase/file.cpp
+@@ -461,7 +461,8 @@
+ #elif defined(__EMSCRIPTEN__)
+   abort();
+ #else
+-#error unknown OS
++#include <stdexcept>
++  throw std::runtime_error(std::string("Unknown OS!"));
+ #endif
+ }
+ 
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-unwindstack-porting.patch b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-unwindstack-porting.patch
new file mode 100644
index 0000000000..8bcfa8fe27
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/debian/deb-sys-unwindstack-porting.patch
@@ -0,0 +1,14 @@
+Description: unwindstack porting
+Forwarded: not-needed
+Upstream-Status: Inappropriate [Debian-specific]
+--- a/system/unwinding/libunwindstack/include/unwindstack/RegsGetLocal.h
++++ b/system/unwinding/libunwindstack/include/unwindstack/RegsGetLocal.h
+@@ -123,7 +123,7 @@
+       : "t1", "memory");
+ }
+ 
+-#elif defined(__i386__) || defined(__x86_64__)
++#else
+ 
+ // Do not change this, some libraries depend on this function existing on
+ // these architectures.
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk b/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk
deleted file mode 100644
index c18aa9c4d2..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-# Makefile for ext4_utils
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/extras/ext4_utils
-make_ext4fs_SRC_FILES += make_ext4fs_main.c
-make_ext4fs_SRC_FILES += canned_fs_config.c
-make_ext4fs_OBJS := $(make_ext4fs_SRC_FILES:.c=.o)
-
-ext2simg_SRC_FILES += ext2simg.c
-ext2simg_OBJS := $(ext2simg_SRC_FILES:.c=.o)
-
-ext4fixup_SRC_FILES += ext4fixup_main.c
-ext4fixup_OBJS := $(ext4fixup_SRC_FILES:.c=.o)
-
-libext4_utils_SRC_FILES += make_ext4fs.c
-libext4_utils_SRC_FILES += ext4fixup.c
-libext4_utils_SRC_FILES += ext4_utils.c
-libext4_utils_SRC_FILES += allocate.c
-libext4_utils_SRC_FILES += contents.c
-libext4_utils_SRC_FILES += extent.c
-libext4_utils_SRC_FILES += indirect.c
-libext4_utils_SRC_FILES += uuid.c
-libext4_utils_SRC_FILES += sha1.c
-libext4_utils_SRC_FILES += wipe.c
-libext4_utils_SRC_FILES += crc16.c
-libext4_utils_SRC_FILES += ext4_sb.c
-libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libsparse
-simg2img_SRC_FILES += simg2img.c
-simg2img_SRC_FILES += sparse_crc32.c
-simg2img_OBJS := $(simg2img_SRC_FILES:.c=.o)
-
-img2simg_SRC_FILES += img2simg.c
-img2simg_OBJS := $(img2simg_SRC_FILES:.c=.o)
-
-simg2simg_SRC_FILES += simg2simg.c
-simg2simg_SRC_FILES += sparse_crc32.c
-simg2simg_OBJS := $(simg2simg_SRC_FILES:.c=.o)
-
-libsparse_SRC_FILES += backed_block.c
-libsparse_SRC_FILES += output_file.c
-libsparse_SRC_FILES += sparse.c
-libsparse_SRC_FILES += sparse_crc32.c
-libsparse_SRC_FILES += sparse_err.c
-libsparse_SRC_FILES += sparse_read.c
-libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/external/libselinux/src
-libselinux_SRC_FILES += callbacks.c
-libselinux_SRC_FILES += check_context.c
-libselinux_SRC_FILES += freecon.c
-libselinux_SRC_FILES += init.c
-libselinux_SRC_FILES += label.c
-libselinux_SRC_FILES += label_file.c
-libselinux_SRC_FILES += label_android_property.c
-libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o)
-
-CFLAGS += -DANDROID
-CFLAGS += -DHOST
-CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -I$(SRCDIR)/system/core/libsparse/include
-CFLAGS += -I$(SRCDIR)/external/libselinux/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-all: make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg
-
-make_ext4fs: libext4_utils.a libsparse.a libselinux.a $(make_ext4fs_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(make_ext4fs_OBJS) \
-                libext4_utils.a libsparse.a libselinux.a -lz -lpcre
-
-ext2simg: libext4_utils.a libselinux.a libsparse.a $(ext2simg_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(ext2simg_OBJS) \
-                libext4_utils.a libselinux.a libsparse.a -lz -lpcre
-
-ext4fixup: libext4_utils.a libsparse.a $(ext4fixup_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(ext4fixup_OBJS) libext4_utils.a libsparse.a -lz
-
-simg2img: libsparse.a $(simg2img_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(simg2img_OBJS) libsparse.a -lz
-
-img2simg: libsparse.a $(img2simg_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(img2simg_OBJS) libsparse.a -lz
-
-simg2simg: libsparse.a $(simg2simg_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(simg2simg_OBJS) libsparse.a -lz
-
-libext4_utils.a: $(libext4_utils_OBJS)
-        $(AR) rcs $@ $(libext4_utils_OBJS)
-
-libsparse.a: $(libsparse_OBJS)
-        $(AR) rcs $@ $(libsparse_OBJS)
-
-libselinux.a: $(libselinux_OBJS)
-        $(AR) rcs $@ $(libselinux_OBJS)
-
-clean:
-        $(RM) $(make_ext4fs_OBJS) $(ext2simg_OBJS) $(ext4fixup_OBJS) \
-                $(simg2img_OBJS) $(img2simg_OBJS) $(simg2simg_OBJS) \
-                $(libext4_utils_OBJS) $(libsparse_OBJS) $(libselinux_OBJS) \
-                make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg *.a
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch
deleted file mode 100644
index 4a19a5d65a..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 354604da9d152f1931e91991d3f34197fc8fc759 Mon Sep 17 00:00:00 2001
-From: Sergio Schvezov <sergio.schvezov@canonical.com>
-Date: Tue, 2 Oct 2018 16:36:54 +0000
-Subject: [PATCH] ext4_utils: remove selinux extensions
-
-* drop useless includes of Android SELINUX extensions
-* avoids having to clone another module
-* this should be sent upstream
-
-Upstream-Status: Inappropriate
----
- ext4_utils/make_ext4fs.c      | 1 -
- ext4_utils/make_ext4fs_main.c | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
-index 2f89ae8a0..732afbed7 100644
---- a/ext4_utils/make_ext4fs.c
-+++ b/ext4_utils/make_ext4fs.c
-@@ -62,7 +62,6 @@
- 
- #include <selinux/selinux.h>
- #include <selinux/label.h>
--#include <selinux/android.h>
- 
- #define O_BINARY 0
- 
-diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c
-index a6c5f6160..f8e7b9da9 100644
---- a/ext4_utils/make_ext4fs_main.c
-+++ b/ext4_utils/make_ext4fs_main.c
-@@ -32,7 +32,6 @@
- #ifndef USE_MINGW
- #include <selinux/selinux.h>
- #include <selinux/label.h>
--#include <selinux/android.h>
- #else
- struct selabel_handle;
- #endif
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch
deleted file mode 100644
index 3b50ffbf36..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b9254539811ce912bfd16dd1d185eba7a10cceff Mon Sep 17 00:00:00 2001
-From: Markus Mayer <mmayer@mmayer.net>
-Date: Wed, 7 Sep 2016 12:58:47 +0300
-Subject: [PATCH] ext4_utils: add -o argument to preserve ownership
-
-See also https://android-review.googlesource.com/#/c/100312/
-
-Upstream-Status: Inappropriate
----
- ext4_utils/make_ext4fs.c      |  6 ++++++
- ext4_utils/make_ext4fs_main.c | 10 ++++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
-index 732afbed7..2cbf04399 100644
---- a/ext4_utils/make_ext4fs.c
-+++ b/ext4_utils/make_ext4fs.c
-@@ -67,6 +67,8 @@
- 
- #endif
- 
-+int preserve_owner = 0;
-+
- /* TODO: Not implemented:
-    Allocating blocks in the same block group as the file inode
-    Hash or binary tree directories
-@@ -185,6 +187,10 @@ static u32 build_directory_structure(const char *full_path, const char *dir_path
-                } else {
-                        dentries[i].mtime = fixed_time;
-                }
-+               if (preserve_owner) {
-+                       dentries[i].uid = stat.st_uid;
-+                       dentries[i].gid = stat.st_gid;
-+               }
-                uint64_t capabilities;
-                if (fs_config_func != NULL) {
- #ifdef ANDROID
-diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c
-index f8e7b9da9..e82d43277 100644
---- a/ext4_utils/make_ext4fs_main.c
-+++ b/ext4_utils/make_ext4fs_main.c
-@@ -47,13 +47,15 @@ struct selabel_handle;
- extern struct fs_info info;
- 
- 
-+extern int preserve_owner;
-+
- static void usage(char *path)
- {
-        fprintf(stderr, "%s [ -l <len> ] [ -j <journal size> ] [ -b <block_size> ]\n", basename(path));
-        fprintf(stderr, "    [ -g <blocks per group> ] [ -i <inodes> ] [ -I <inode size> ]\n");
-        fprintf(stderr, "    [ -L <label> ] [ -f ] [ -a <android mountpoint> ]\n");
-        fprintf(stderr, "    [ -S file_contexts ] [ -C fs_config ] [ -T timestamp ]\n");
--       fprintf(stderr, "    [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -v ] [ -B <block_list_file> ]\n");
-+       fprintf(stderr, "    [ -z | -s ] [ -w ] [ -c ] [ -J ] [ -o ] [ -v ] [ -B <block_list_file> ]\n");
-        fprintf(stderr, "    <filename> [<directory>]\n");
- }
- 
-@@ -79,7 +81,7 @@ int main(int argc, char **argv)
-        struct selinux_opt seopts[] = { { SELABEL_OPT_PATH, "" } };
- #endif
- 
--       while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctv")) != -1) {
-+       while ((opt = getopt(argc, argv, "l:j:b:g:i:I:L:a:S:T:C:B:fwzJsctov")) != -1) {
-                switch (opt) {
-                case 'l':
-                        info.len = parse_num(optarg);
-@@ -142,6 +144,10 @@ int main(int argc, char **argv)
-                        }
- #endif
-                        break;
-+               case 'o':
-+                       preserve_owner = 1;
-+                       printf("Warning: Enabling 'preserve ownership', this is an unofficial feature!\n");
-+                       break;
-                case 'v':
-                        verbose = 1;
-                        break;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
deleted file mode 100644
index b77c0ebc13..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From c9f8cb184a7218c97ff966db44da6dd814c0e273 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@gmail.com>
-Date: Fri, 21 Mar 2025 09:49:32 +0000
-Subject: [PATCH] ext4_utils: drop unused parameter from allocate_inode()
-
-* fixes build with gcc-15:
-  http://errors.yoctoproject.org/Errors/Details/848455/
-
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_directory':
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:115:29: error: too many arguments to function 'allocate_inode'; expected 0, have 1
-  115 |                 inode_num = allocate_inode(info);
-      |                             ^~~~~~~~~~~~~~ ~~~~
-In file included from TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:32:
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
-   61 | u32 allocate_inode();
-      |     ^~~~~~~~~~~~~~
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_file':
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:183:21: error: too many arguments to function 'allocate_inode'; expected 0, have 1
-  183 |         inode_num = allocate_inode(info);
-      |                     ^~~~~~~~~~~~~~ ~~~~
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
-   61 | u32 allocate_inode();
-      |     ^~~~~~~~~~~~~~
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c: In function 'make_link':
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/contents.c:218:21: error: too many arguments to function 'allocate_inode'; expected 0, have 1
-  218 |         inode_num = allocate_inode(info);
-      |                     ^~~~~~~~~~~~~~ ~~~~
-TOPDIR/tmp/work/core2-64-oe-linux/android-tools/5.1.1.r37/git/system/extras/ext4_utils/allocate.h:61:5: note: declared here
-   61 | u32 allocate_inode();
-      |     ^~~~~~~~~~~~~~
-make: *** [<builtin>: contents.o] Error 1
-
-Upstream-Status: Pending [this whole code was removed in newer version android-9.0.0_r1 https://android.googlesource.com/platform/system/extras/+/7a837fcd6e9c0e0219f743052c78cc1c5988dfaf]
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
----
- ext4_utils/contents.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c
-index 3144de93f..ac1b71706 100644
---- a/ext4_utils/contents.c
-+++ b/ext4_utils/contents.c
-@@ -112,7 +112,7 @@ u32 make_directory(u32 dir_inode_num, u32 entries, struct dentry *dentries,
-        len = blocks * info.block_size;
- 
-        if (dir_inode_num) {
--               inode_num = allocate_inode(info);
-+               inode_num = allocate_inode();
-        } else {
-                dir_inode_num = EXT4_ROOT_INO;
-                inode_num = EXT4_ROOT_INO;
-@@ -180,7 +180,7 @@ u32 make_file(const char *filename, u64 len)
-        struct ext4_inode *inode;
-        u32 inode_num;
- 
--       inode_num = allocate_inode(info);
-+       inode_num = allocate_inode();
-        if (inode_num == EXT4_ALLOCATE_FAILED) {
-                error("failed to allocate inode\n");
-                return EXT4_ALLOCATE_FAILED;
-@@ -215,7 +215,7 @@ u32 make_link(const char *link)
-        u32 inode_num;
-        u32 len = strlen(link);
- 
--       inode_num = allocate_inode(info);
-+       inode_num = allocate_inode();
-        if (inode_num == EXT4_ALLOCATE_FAILED) {
-                error("failed to allocate inode\n");
-                return EXT4_ALLOCATE_FAILED;
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk b/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk
deleted file mode 100644
index b9ba95f38a..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-# Makefile for fastboot
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/core/fastboot
-fastboot_SRC_FILES += protocol.c
-fastboot_SRC_FILES += engine.c
-fastboot_SRC_FILES += bootimg.c
-fastboot_SRC_FILES += fastboot.c
-fastboot_SRC_FILES += util.c
-fastboot_SRC_FILES += fs.c
-fastboot_SRC_FILES += usb_linux.c
-fastboot_SRC_FILES += util_linux.c
-fastboot_OBJS := $(fastboot_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libzipfile
-libzipfile_SRC_FILES += centraldir.c
-libzipfile_SRC_FILES += zipfile.c
-libzipfile_OBJS := $(libzipfile_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/extras/ext4_utils
-libext4_utils_SRC_FILES += make_ext4fs.c
-libext4_utils_SRC_FILES += ext4fixup.c
-libext4_utils_SRC_FILES += ext4_utils.c
-libext4_utils_SRC_FILES += allocate.c
-libext4_utils_SRC_FILES += contents.c
-libext4_utils_SRC_FILES += extent.c
-libext4_utils_SRC_FILES += indirect.c
-libext4_utils_SRC_FILES += uuid.c
-libext4_utils_SRC_FILES += sha1.c
-libext4_utils_SRC_FILES += wipe.c
-libext4_utils_SRC_FILES += crc16.c
-libext4_utils_SRC_FILES += ext4_sb.c
-libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libsparse
-libsparse_SRC_FILES += backed_block.c
-libsparse_SRC_FILES += output_file.c
-libsparse_SRC_FILES += sparse.c
-libsparse_SRC_FILES += sparse_crc32.c
-libsparse_SRC_FILES += sparse_err.c
-libsparse_SRC_FILES += sparse_read.c
-libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/external/libselinux/src
-libselinux_SRC_FILES += callbacks.c
-libselinux_SRC_FILES += check_context.c
-libselinux_SRC_FILES += freecon.c
-libselinux_SRC_FILES += init.c
-libselinux_SRC_FILES += label.c
-libselinux_SRC_FILES += label_file.c
-libselinux_SRC_FILES += label_android_property.c
-libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o)
-
-CFLAGS += -std=gnu11
-CFLAGS += -DANDROID
-# CFLAGS += -DUSE_F2FS
-CFLAGS += -DHOST
-CFLAGS += -I$(SRCDIR)/system/core/fastboot
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -I$(SRCDIR)/system/core/mkbootimg
-CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils
-CFLAGS += -I$(SRCDIR)/system/extras/f2fs_utils
-CFLAGS += -I$(SRCDIR)/system/core/libsparse/include
-CFLAGS += -I$(SRCDIR)/external/libselinux/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-LIBS += libzipfile.a libext4_utils.a libsparse.a libselinux.a -lz -lpcre
-
-all: fastboot
-
-fastboot: libzipfile.a libext4_utils.a libsparse.a libselinux.a $(fastboot_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(fastboot_OBJS) $(LIBS)
-
-libzipfile.a: $(libzipfile_OBJS)
-        $(AR) rcs $@ $(libzipfile_OBJS)
-
-libext4_utils.a: $(libext4_utils_OBJS)
-        $(AR) rcs $@ $(libext4_utils_OBJS)
-
-libsparse.a: $(libsparse_OBJS)
-        $(AR) rcs $@ $(libsparse_OBJS)
-
-libselinux.a: $(libselinux_OBJS)
-        $(AR) rcs $@ $(libselinux_OBJS)
-
-clean:
-        $(RM) $(fastboot_OBJS) $(libzipfile_OBJS) $(libext4_utils_OBJS) \
-                $(libsparse_OBJS) $(libselinux_OBJS) fastboot *.a
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/gitignore b/meta-oe/recipes-devtools/android-tools/android-tools/gitignore
deleted file mode 100644
index b034c10a1e..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/gitignore
+++ /dev/null
@@ -1,59 +0,0 @@
-*
-!.gitignore
-!*.indirectionsymlink
-!*.[ch]
-!*.mk
-!*.patch
-!*.service
-!NOTICE
-!MODULE_LICENSE_*
-!/system/
-!/system/core/
-!/system/core/adb/
-!/system/core/fastboot/
-!/system/core/fs_mgr/
-!/system/core/fs_mgr/include/
-!/system/core/include/
-!/system/core/include/android/
-!/system/core/include/cutils/
-!/system/core/include/log/
-!/system/core/include/mincrypt/
-!/system/core/include/private/
-!/system/core/include/utils/
-!/system/core/include/zipfile/
-!/system/core/liblog/
-!/system/core/liblog/tests/
-!/system/core/libcutils/
-!/system/core/libmincrypt/
-!/system/core/libzipfile/
-!/system/core/libsparse/
-!/system/core/libsparse/include/
-!/system/core/libsparse/include/sparse/
-!/system/core/libsparse/simg_dump.py
-!/system/core/mkbootimg/
-!/system/extras/
-!/system/extras/ext4_utils/
-!/system/extras/ext4_utils/mkuserimg.sh
-!/system/extras/ext4_utils/test_ext4fixup
-!/system/extras/f2fs_utils/
-!/hardware/
-!/hardware/libhardware/
-!/hardware/libhardware/include/
-!/hardware/libhardware/include/hardware/
-!/external/
-!/external/libselinux/
-!/external/libselinux/include/
-!/external/libselinux/include/selinux/
-!/external/libselinux/src/
-!/external/f2fs-tools/
-!/external/f2fs-tools/include/
-!/external/f2fs-tools/lib/
-!/external/f2fs-tools/mkfs/
-!/build/
-!/build/core/
-!/build/core/version_defaults.mk
-!/build/core/combo/
-!/build/core/combo/include/
-!/build/core/combo/include/arch/
-!/build/core/combo/include/arch/linux-*/
-!/build/core/combo/include/arch/linux-*/AndroidConfig.h
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-Remove-bionic-specific-calls.patch b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-Remove-bionic-specific-calls.patch
deleted file mode 100644
index 9de2593df8..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-Remove-bionic-specific-calls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36654a4484117e5f4d63a810c0d94bc9c7ee3a83 Mon Sep 17 00:00:00 2001
-From: Fathi Boudra <fabo@debian.org>
-Date: Tue, 2 Oct 2018 16:36:54 +0000
-Subject: [PATCH] Remove bionic specific calls
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/procattr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/procattr.c b/src/procattr.c
-index f350808..761cf8e 100644
---- a/src/procattr.c
-+++ b/src/procattr.c
-@@ -8,7 +8,7 @@
- #include "selinux_internal.h"
- #include "policy.h"
- 
--#ifdef HOST
-+#ifndef __BIONIC__
- static pid_t gettid(void)
- {
-        return syscall(__NR_gettid);
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch
deleted file mode 100644
index 8b5e4cf999..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f4f9d24860e1b5cd4f6a014f3fda7cd33ebe5be7 Mon Sep 17 00:00:00 2001
-From: Petr Lautrbach <plautrba@redhat.com>
-Date: Sat, 27 Jul 2019 08:20:20 -0700
-Subject: [PATCH] libselinux: Do not define gettid() if glibc >= 2.30 is used
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since version 2.30 glibc implements gettid() system call wrapper, see
-https://sourceware.org/bugzilla/show_bug.cgi?id=6399
-
-Fixes:
-cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I../include -D_GNU_SOURCE  -DNO_ANDROID_BACKEND   -c -o procattr.o procattr.c
-procattr.c:28:14: error: static declaration of ‘gettid’ follows non-static declaration
-   28 | static pid_t gettid(void)
-      |              ^~~~~~
-In file included from /usr/include/unistd.h:1170,
-                 from procattr.c:2:
-/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here
-   34 | extern __pid_t gettid (void) __THROW;
-      |                ^~~~~~
-
-Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
-Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/procattr.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
---- a/src/procattr.c
-+++ b/src/procattr.c
-@@ -8,12 +8,16 @@
- #include "selinux_internal.h"
- #include "policy.h"
- 
--#ifndef __BIONIC__
-+/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and
-+ * has a definition for it */
-+#if defined(__GLIBC_)
-+#if !__GLIBC_PREREQ(2,30)
- static pid_t gettid(void)
- {
-        return syscall(__NR_gettid);
- }
- #endif
-+#endif
- 
- static int getprocattrcon(char ** context,
-                          pid_t pid, const char *attr)
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk b/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk
deleted file mode 100644
index 519f609fd2..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# Makefile for mkbootimg
-
-SRCDIR ?= $(S)
-
-VPATH += $(SRCDIR)/system/core/mkbootimg
-mkbootimg_SRC_FILES += mkbootimg.c
-mkbootimg_OBJS := $(mkbootimg_SRC_FILES:.c=.o)
-
-VPATH += $(SRCDIR)/system/core/libmincrypt
-libmincrypt_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c
-libmincrypt_OBJS := $(libmincrypt_SRC_FILES:.c=.o)
-
-CFLAGS += -DANDROID
-CFLAGS += -I$(SRCDIR)/system/core/mkbootimg
-CFLAGS += -I$(SRCDIR)/system/core/include
-CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h
-
-LIBS += libmincrypt.a
-
-all: mkbootimg
-
-mkbootimg: libmincrypt.a $(mkbootimg_OBJS)
-        $(CC) -o $@ $(LDFLAGS) $(mkbootimg_OBJS) $(LIBS)
-
-libmincrypt.a: $(libmincrypt_OBJS)
-        $(AR) rcs $@ $(libmincrypt_OBJS)
-
-clean:
-        $(RM) $(mkbootimg_OBJS) $(libmincrypt_OBJS) mkbootimg *.a
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_35.0.2.bb b/meta-oe/recipes-devtools/android-tools/android-tools_35.0.2.bb
new file mode 100644
index 0000000000..3a277cd4b5
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools_35.0.2.bb
@@ -0,0 +1,237 @@
+DESCRIPTION = "Various utilities from Android"
+SECTION = "console/utils"
+LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-2-Clause & BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \
+    file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
+    file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
+    file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
+"
+
+DEPENDS = " \
+    android-libboringssl \
+    brotli \
+    libcap \
+    7zip \
+    protobuf \
+    protobuf-native \
+    libusb \
+    squashfs-tools \
+    zlib \
+"
+
+# The debian/ patches are copied from android-platform-tools/debian/patches and
+# applied in the order defined by debian/patches/series. Listing them as
+# first-class SRC_URI entries (rather than running quilt inside do_patch) makes
+# the recipe work correctly with devtool.
+SRC_URI = "https://deb.debian.org/debian/pool/main/a/android-platform-tools/android-platform-tools_35.0.2.orig.tar.xz;name=orig;subdir=android-platform-tools-${PV} \
+           https://deb.debian.org/debian/pool/main/a/android-platform-tools/android-platform-tools_35.0.2-1~exp6.debian.tar.xz;name=debian;subdir=android-platform-tools-${PV} \
+           file://android-tools-adbd.service \
+           file://debian/deb-gcc-stdatomic.patch \
+           file://debian/deb-gcc-workaround__builtin_available.patch \
+           file://debian/deb-gcc-Nullable.patch \
+           file://debian/deb-sys-unwindstack-porting.patch \
+           file://debian/deb-sys-move-log-file-to-proper-dir.patch \
+           file://debian/deb-sys-Added-missing-headers.patch \
+           file://debian/deb-sys-libusb-header-path.patch \
+           file://debian/deb-sys-throw-exception-on-unknown-os.patch \
+           file://debian/deb-sys-hard-code-build-number.patch \
+           file://debian/deb-sys-stub-out-fastdeploy.patch \
+           file://debian/deb-sys-Implement-const_iterator-operator.patch \
+           file://debian/deb-sys-Drop-gki-dependency-from-mkbootimg.patch \
+           file://debian/deb-sys-add-missing-headers.patch \
+           file://debian/deb-dev-typos.patch \
+           file://debian/deb-adbd-adbd-allow-usb-on-linux.patch \
+           file://debian/deb-adbd-adbd-allow-notifying-systemd.patch \
+           file://debian/deb-adbd-adbd-usb-drop-property-monitor.patch \
+           file://debian/deb-adbd-adbd-don-t-require-authorization-on-Linux.patch \
+           file://0001-libbacktrace.mk-Link-against-staged-lib7z.patch \
+           file://0002-debian-makefiles-yocto-compat.patch \
+           file://0003-gcc-nullability-and-thread-annotation-compat.patch \
+           file://0004-fastboot-super_flash_helper-include-climits.patch \
+           file://0005-adb-host-usb-compat.patch \
+           file://0006-adbd-enable-root-and-remount-support.patch \
+           file://0007-libcutils-guard-Android-private-header-with-addition.patch \
+           file://0008-adb-GCC-compatibility-fixes-for-usb_linux-and-sysdep.patch \
+           file://0009-libbase-include-stdint.h-in-hex.cpp.patch \
+           file://0010-adbd-make-systemd-sd_notify-conditional-on-HAVE_SYSTEMD.patch \
+           "
+
+SRC_URI[orig.md5sum] = "352376965cdef7bd7505d8fefdd43d50"
+SRC_URI[orig.sha256sum] = "ec1d317608db3328bfbddf7152c8d7f185c7c87b2175081416344434546a43da"
+SRC_URI[debian.md5sum] = "1de890bd272da9e8cd35bc9579802f1f"
+SRC_URI[debian.sha256sum] = "f03a89b82ea8dfbe3cb77d5326eedf0d15984f5896885e8c5df64cf421819579"
+
+S = "${UNPACKDIR}/android-platform-tools-${PV}"
+B = "${UNPACKDIR}/${BPN}"
+
+# http://errors.yoctoproject.org/Errors/Details/1debian881/
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"
+
+COMPATIBLE_HOST:powerpc = "(null)"
+COMPATIBLE_HOST:powerpc64 = "(null)"
+COMPATIBLE_HOST:powerpc64le = "(null)"
+
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}-adbd"
+SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service"
+
+CFLAGS:append = " -fPIC -std=gnu2x"
+CXXFLAGS:append = " -fPIC -std=gnu++20 -D_Nonnull= -D_Nullable= -I${STAGING_INCDIR}/boringssl"
+LDFLAGS:append = " -fPIC -L${STAGING_LIBDIR}/android"
+
+
+CC:append:class-native = " -I${STAGING_INCDIR}"
+CC:append:class-nativesdk = " -I${STAGING_INCDIR}"
+
+PREREQUISITE_core = ""
+PREREQUISITE_core:class-target = "liblog libbase libcutils libcrypto_utils libadb"
+PREREQUISITE_core:class-native = "liblog libbase libcutils libziparchive libsparse libcrypto_utils libadb"
+
+TOOLS_TO_BUILD = ""
+TOOLS_TO_BUILD:class-target = "adbd"
+TOOLS_TO_BUILD:class-native = "adb fastboot img2simg simg2img"
+
+BUILD_SYSROOT = "${RECIPE_SYSROOT}"
+BUILD_SYSROOT:class-native = "${RECIPE_SYSROOT_NATIVE}"
+
+do_compile() {
+    case "${HOST_ARCH}" in
+    arm)
+        export android_arch=linux-arm
+        cpu=arm
+        deb_host_arch=arm
+        ;;
+    aarch64)
+        export android_arch=linux-arm64
+        cpu=arm64
+        deb_host_arch=arm64
+        ;;
+    riscv64)
+        export android_arch=linux-riscv64
+        cpu=riscv64
+        deb_host_arch=riscv64
+        ;;
+    mips|mipsel)
+        export android_arch=linux-mips
+        cpu=mips
+        deb_host_arch=mips
+        ;;
+    mips64|mips64el)
+        export android_arch=linux-mips64
+        cpu=mips64
+        deb_host_arch=mips64
+        ;;
+    powerpc|powerpc64)
+        export android_arch=linux-ppc
+        cpu=ppc
+        deb_host_arch=ppc64
+        ;;
+    i586|i686)
+        export android_arch=linux-x86
+        cpu=x86
+        deb_host_arch=i386
+        ;;
+    x86_64)
+        export android_arch=linux-x86
+        cpu=x86_64
+        deb_host_arch=amd64
+        ;;
+    *)
+        bbfatal "Unsupported HOST_ARCH=${HOST_ARCH}"
+        ;;
+    esac
+
+    export SRCDIR=${S}
+    export DEB_HOST_ARCH=${deb_host_arch}
+    export DEB_HOST_MULTIARCH=
+    export SYSROOT=${BUILD_SYSROOT}
+
+    if echo " ${TOOLS_TO_BUILD} " | grep -Eq " (adb|fastboot) "; then
+        # Native host tools should use the host system's ELF interpreter, not
+        # Yocto's uninative loader under /workdir.
+        export LDFLAGS="$(printf '%s\n' "${LDFLAGS}" | \
+            sed -E 's@-Wl,--dynamic-linker=[^[:space:]]+@@g; s@[[:space:]]+@ @g; s@^[[:space:]]+@@; s@[[:space:]]+$@@')"
+    fi
+
+    # Debian's make fragments expect generated protobuf sources to already be
+    # present under packages/modules/adb/proto, but the orig tarball only ships
+    # the .proto inputs.
+    for proto in adb_host adb_known_hosts app_processes key_type pairing; do
+        ${STAGING_BINDIR_NATIVE}/protoc \
+            --proto_path=${S}/packages/modules/adb/proto \
+            --cpp_out=${S}/packages/modules/adb/proto \
+            ${S}/packages/modules/adb/proto/${proto}.proto
+    done
+
+    if [ -d ${S}/packages/modules/adb/fastdeploy/proto ]; then
+        for proto in ${S}/packages/modules/adb/fastdeploy/proto/*.proto; do
+            [ -e "$proto" ] || continue
+            ${STAGING_BINDIR_NATIVE}/protoc \
+                --proto_path=${S}/packages/modules/adb \
+                --cpp_out=${S}/packages/modules/adb \
+                "$proto"
+        done
+    fi
+
+    # Debian's make fragments write archives and binaries under debian/out/*
+    # but do not consistently create parent directories before invoking ar.
+    install -d ${S}/debian/out/system/extras
+
+    # Debian replaces Android's Soong build system with hand-written GNU make
+    # fragments under debian/system/ and debian/external/.
+    for tool in ${PREREQUISITE_core}; do
+        oe_runmake -f ${S}/debian/system/${tool}.mk -C ${S}
+    done
+
+    if echo " ${TOOLS_TO_BUILD} " | grep -q " fastboot "; then
+        # Debian's fastboot.mk links against the ext4_utils static archive from
+        # debian/out/system/extras, so build that helper archive first.
+        oe_runmake -f ${S}/debian/system/extras/libext4_utils.mk -C ${S}
+    fi
+
+    for tool in ${TOOLS_TO_BUILD}; do
+        oe_runmake -f ${S}/debian/system/${tool}.mk -C ${S} \
+            ${@'HAVE_SYSTEMD=1' if bb.utils.contains('PACKAGECONFIG', 'systemd', True, False, d) else ''}
+    done
+}
+
+do_install() {
+    for tool in ${TOOLS_TO_BUILD}; do
+        install -D -p -m0755 ${S}/debian/out/system/${tool} ${D}${bindir}/${tool}
+    done
+
+    if echo " ${TOOLS_TO_BUILD} " | grep -q " adbd "; then
+        install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \
+          ${D}${systemd_unitdir}/system/android-tools-adbd.service
+    fi
+
+    install -d ${D}${libdir}/android/
+    install -m0755 ${S}/debian/out/system/lib*.so.* ${D}${libdir}/android/
+}
+
+PACKAGES =+ "${PN}-adbd"
+RDEPENDS:${PN}:class-target = "android-tools-conf-configfs 7zip android-libboringssl"
+RDEPENDS:${PN}-adbd += "${PN}"
+PRIVATE_LIBS:${PN} = "liblog.so.0 libbase.so.0 libcutils.so.0"
+
+inherit useradd
+USERADD_PACKAGES = "${PN}-adbd"
+USERADD_PARAM:${PN}-adbd = "--system --no-create-home --shell /bin/false --user-group adb"
+
+FILES:${PN} += " \
+    ${libdir}/android \
+    ${libdir}/android/* \
+"
+
+FILES:${PN}-adbd = " \
+    ${bindir}/adbd \
+    ${systemd_unitdir}/system/android-tools-adbd.service \
+"
+
+BBCLASSEXTEND = "native"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = ",,systemd"
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
deleted file mode 100644
index c04a1ef8c4..0000000000
--- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
+++ /dev/null
@@ -1,189 +0,0 @@
-DESCRIPTION = "Different utilities from Android"
-SECTION = "console/utils"
-LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-2-Clause & BSD-3-Clause"
-LIC_FILES_CHKSUM = " \
-    file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \
-    file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \
-    file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
-    file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
-"
-DEPENDS = "libbsd libpcre zlib libcap"
-DEPENDS:append:class-target = " openssl"
-
-ANDROID_MIRROR = "android.googlesource.com"
-
-# matches with android-5.1.1_r37
-SRCREV_core = "2314b110bdebdbfd2d94c502282f9e57c849897e"
-SRCREV_extras = "3ecbe8d841df96127d7855661293e5ab6ba6c205"
-SRCREV_libhardware = "be55eb1f4d840c82ffaf7c47460df17ff5bc4d9b"
-SRCREV_libselinux = "07e9e1339ad1ba608acfba9dce2d0f474b252feb"
-SRCREV_build = "16e987def3d7d8f7d30805eb95cef69e52a87dbc"
-
-SRCREV_FORMAT = "core_extras_libhardware_libselinux_build"
-SRC_URI = " \
-    git://${ANDROID_MIRROR}/platform/system/core;name=core;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/system/core \
-    git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/system/extras \
-    git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/hardware/libhardware \
-    git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/external/libselinux \
-    git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/build \
-    file://core/0001-adb-remove-selinux-extensions.patch;patchdir=system/core \
-    file://core/0002-adb-Use-local-sockets-where-appropriate.patch;patchdir=system/core \
-    file://core/0003-adb-define-shell-command.patch;patchdir=system/core \
-    file://core/0004-adb-Fix-build-on-big-endian-systems.patch;patchdir=system/core \
-    file://core/0005-adb-add-base64-implementation.patch;patchdir=system/core \
-    file://core/0006-adb-Musl-fixes.patch;patchdir=system/core \
-    file://core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch;patchdir=system/core \
-    file://core/0008-adb-Allow-adbd-to-be-ran-as-root.patch;patchdir=system/core \
-    file://core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch;patchdir=system/core \
-    file://core/0010-Use-linux-capability.h-on-linux-systems-too.patch;patchdir=system/core \
-    file://core/0011-Remove-bionic-specific-calls.patch;patchdir=system/core \
-    file://core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch;patchdir=system/core \
-    file://core/adb_libssl_11.diff;patchdir=system/core \
-    file://core/b64_pton_function_decl.patch;patchdir=system/core \
-    file://core/0013-adb-Support-riscv64.patch;patchdir=system/core \
-    file://core/0014-add-u3-ss-descriptor-support-for-adb.patch;patchdir=system/core \
-    file://core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch;patchdir=system/core \
-    file://core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch;patchdir=system/core \
-    file://core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch;patchdir=system/core \
-    file://core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch;patchdir=system/core \
-    file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \
-    file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \
-    file://extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch;patchdir=system/extras \
-    file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \
-    file://libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch;patchdir=external/libselinux \
-    file://android-tools-adbd.service \
-    file://build/0001-Riscv-Add-risc-v-Android-config-header.patch;patchdir=build \
-    file://gitignore \
-    file://adb.mk;subdir=${BPN} \
-    file://adbd.mk;subdir=${BPN} \
-    file://ext4_utils.mk;subdir=${BPN} \
-    file://fastboot.mk;subdir=${BPN} \
-    file://mkbootimg.mk;subdir=${BPN} \
-"
-
-
-B = "${WORKDIR}/${BPN}"
-
-# http://errors.yoctoproject.org/Errors/Details/133881/
-ARM_INSTRUCTION_SET:armv4 = "arm"
-ARM_INSTRUCTION_SET:armv5 = "arm"
-
-COMPATIBLE_HOST:powerpc = "(null)"
-COMPATIBLE_HOST:powerpc64 = "(null)"
-COMPATIBLE_HOST:powerpc64le = "(null)"
-
-inherit systemd
-
-SYSTEMD_PACKAGES = "${PN}-adbd"
-SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service"
-
-# Find libbsd headers during native builds
-CC:append:class-native = " -I${STAGING_INCDIR}"
-CC:append:class-nativesdk = " -I${STAGING_INCDIR}"
-
-TOOLS = "adb fastboot ext4_utils mkbootimg adbd"
-
-# Adb needs sys/capability.h, which is not available for native*
-TOOLS:class-native = "fastboot ext4_utils mkbootimg"
-TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg"
-
-do_compile() {
-    cp ${UNPACKDIR}/gitignore ${S}/.gitignore
-
-    # Setting both variables below causing our makefiles to not work with
-    # implicit make rules
-    CFLAGS="-ffile-prefix-map=${S}=${TARGET_DBGSRC_DIR}"
-    unset CPPFLAGS
-
-    export SRCDIR=${S}
-
-    case "${HOST_ARCH}" in
-      arm)
-        export android_arch=linux-arm
-      ;;
-      aarch64)
-        export android_arch=linux-arm64
-      ;;
-      riscv64)
-        export android_arch=linux-riscv64
-      ;;
-      mips|mipsel)
-        export android_arch=linux-mips
-      ;;
-      mips64|mips64el)
-        export android_arch=linux-mips64
-      ;;
-      powerpc|powerpc64)
-        export android_arch=linux-ppc
-      ;;
-      i586|i686|x86_64)
-        export android_arch=linux-x86
-      ;;
-    esac
-
-    for tool in ${TOOLS}; do
-      mkdir -p ${B}/${tool}
-      oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool}
-    done
-}
-
-do_install() {
-    if echo ${TOOLS} | grep -q "ext4_utils" ; then
-        install -D -p -m0755 ${S}/system/core/libsparse/simg_dump.py ${D}${bindir}/simg_dump
-        install -D -p -m0755 ${S}/system/extras/ext4_utils/mkuserimg.sh ${D}${bindir}/mkuserimg
-
-        install -m0755 ${B}/ext4_utils/ext2simg ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/ext4fixup ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/img2simg ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/make_ext4fs ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/simg2img ${D}${bindir}
-        install -m0755 ${B}/ext4_utils/simg2simg ${D}${bindir}
-    fi
-
-    if echo ${TOOLS} | grep -q "adb\>" ; then
-        install -d ${D}${bindir}
-        install -m0755 ${B}/adb/adb ${D}${bindir}
-    fi
-
-    if echo ${TOOLS} | grep -q "adbd" ; then
-        install -d ${D}${bindir}
-        install -m0755 ${B}/adbd/adbd ${D}${bindir}
-    fi
-
-    # Outside the if statement to avoid errors during do_package
-    install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \
-      ${D}${systemd_unitdir}/system/android-tools-adbd.service
-
-    if echo ${TOOLS} | grep -q "fastboot" ; then
-        install -d ${D}${bindir}
-        install -m0755 ${B}/fastboot/fastboot ${D}${bindir}
-    fi
-
-    if echo ${TOOLS} | grep -q "mkbootimg" ; then
-        install -d ${D}${bindir}
-        install -m0755 ${B}/mkbootimg/mkbootimg ${D}${bindir}
-    fi
-}
-
-PACKAGES =+ "${PN}-fstools ${PN}-adbd"
-
-RDEPENDS:${PN}-adbd = "${PN}-conf"
-RDEPENDS:${PN}-fstools = "bash"
-
-FILES:${PN}-adbd = "\
-    ${bindir}/adbd \
-    ${systemd_unitdir}/system/android-tools-adbd.service \
-"
-
-FILES:${PN}-fstools = "\
-    ${bindir}/ext2simg \
-    ${bindir}/ext4fixup \
-    ${bindir}/img2simg \
-    ${bindir}/make_ext4fs \
-    ${bindir}/simg2img \
-    ${bindir}/simg2simg \
-    ${bindir}/simg_dump \
-    ${bindir}/mkuserimg \
-"
-
-BBCLASSEXTEND = "native"