6 files changed, 99 insertions, 26 deletions

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
index 3f9d49a2d2..342e7fd1a5 100644
--- 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
@@ -3,6 +3,8 @@ 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 \
@@ -14,17 +16,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-cleanup ${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 ${WORKDIR}/android-gadget-setup.machine ] ; then
+    if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
         install -d ${D}${sysconfdir}
-        install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${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 ${WORKDIR}/10-adbd-configfs.conf ${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} += " \
@@ -33,3 +35,4 @@ FILES:${PN} += " \
 
 PROVIDES += "android-tools-conf"
 RPROVIDES:${PN} = "android-tools-conf"
+BBCLASSEXTEND = "native"
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 34b1a9bdd2..764d6b404f 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
@@ -5,11 +5,13 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://android-gadget-setup"
 
+S = "${UNPACKDIR}"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
 }
 
 python () {
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 ddf8d7f74e..b6661f2e39 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
@@ -1,6 +1,6 @@
 [Unit]
 Description=Android Debug Bridge
-ConditionPathExists=/var/usb-debugging-enabled
+ConditionPathExists=/etc/usb-debugging-enabled
 Before=android-system.service
 
 [Service]
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
index 177d69a97a..ddb41ea4b0 100644
--- 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
@@ -17,9 +17,10 @@ Upstream-Status: Pending
 +++ 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();
+-    BIGNUM* n = BN_new();
++    const BIGNUM* n;
      BIGNUM* n0inv = BN_new();
-+    BIGNUM* e = BN_new();
++    const BIGNUM* e;
  
      if (RSA_size(rsa) != RSANUMBYTES) {
          ret = 0;
@@ -32,7 +33,7 @@ Upstream-Status: Pending
      BN_set_bit(r, RSANUMWORDS * 32);
      BN_mod_sqr(rr, r, n, ctx);
      BN_div(NULL, rem, n, r32, ctx);
-@@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
+@@ -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);
      }
@@ -41,3 +42,7 @@ Upstream-Status: Pending
  
  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/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
new file mode 100644
index 0000000000..b77c0ebc13
--- /dev/null
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
@@ -0,0 +1,69 @@
+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_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
index 1c66ea4997..c04a1ef8c4 100644
--- 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
@@ -21,11 +21,11 @@ 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=git/system/core \
-    git://${ANDROID_MIRROR}/platform/system/extras;name=extras;protocol=https;nobranch=1;destsuffix=git/system/extras \
-    git://${ANDROID_MIRROR}/platform/hardware/libhardware;name=libhardware;protocol=https;nobranch=1;destsuffix=git/hardware/libhardware \
-    git://${ANDROID_MIRROR}/platform/external/libselinux;name=libselinux;protocol=https;nobranch=1;destsuffix=git/external/libselinux \
-    git://${ANDROID_MIRROR}/platform/build;name=build;protocol=https;nobranch=1;destsuffix=git/build \
+    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 \
@@ -48,6 +48,7 @@ SRC_URI = " \
     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 \
@@ -61,7 +62,6 @@ SRC_URI = " \
 "
 
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/${BPN}"
 
 # http://errors.yoctoproject.org/Errors/Details/133881/
@@ -88,7 +88,7 @@ TOOLS:class-native = "fastboot ext4_utils mkbootimg"
 TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg"
 
 do_compile() {
-    cp ${WORKDIR}/gitignore ${S}/.gitignore
+    cp ${UNPACKDIR}/gitignore ${S}/.gitignore
 
     # Setting both variables below causing our makefiles to not work with
     # implicit make rules
@@ -123,7 +123,7 @@ do_compile() {
 
     for tool in ${TOOLS}; do
       mkdir -p ${B}/${tool}
-      oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool}
+      oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool}
     done
 }
 
@@ -151,7 +151,7 @@ do_install() {
     fi
 
     # Outside the if statement to avoid errors during do_package
-    install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \
+    install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \
       ${D}${systemd_unitdir}/system/android-tools-adbd.service
 
     if echo ${TOOLS} | grep -q "fastboot" ; then
@@ -187,9 +187,3 @@ FILES:${PN}-fstools = "\
 "
 
 BBCLASSEXTEND = "native"
-
-android_tools_enable_devmode() {
-    touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled
-}
-
-ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}"