[meta-oe][PATCH v2 0/2] android-tools: migration and cleanup

Ashish Kumar Mishra
2026-03-30T10:59:02Z

From: Ashish Kumar Mishra <ashishkumar.mishra@bmwtechworks.in>

Following the feedback on the initial RFC, the logic has been split into two
distinct commits to improve clarity and maintainability:

1. Removal of the legacy android-tools 5.x version from meta-oe/recipes-devtools.
2. Migration of android-tools v29.x from dynamic-layers/selinux to meta-oe.

This ensures the newer version is correctly positioned in meta-oe while
cleaning up the deprecated 5.x recipe.

Ashish Kumar Mishra (2):
android-tools: remove android-tools 5.x from meta-oe/recipes-devtools
android-tools: move android-tools v29.x from dynamic-layers/selinux to
meta-oe

.../android-tools-conf/android-gadget-setup | 37 --
.../android-tools/android-tools-conf_1.0.bb | 20 -
.../android-tools/android-tools/adbd.mk | 87 -----
.../android-tools/android-tools-adbd.service | 13 -
.../10-adbd-configfs.conf | 4 -
.../android-gadget-cleanup | 24 --
.../android-gadget-setup | 38 --
.../android-gadget-start | 9 -
.../android-tools-conf-configfs_1.0.bb | 38 --
.../android-tools/android-tools-conf_1.0.bb | 4 +-
.../0001-Fixes-for-yocto-build.patch | 0
.../0001-liblp-fix-building-with-GCC-14.patch | 0
...difications-to-make-it-build-in-yoct.patch | 0
...usbdevfs_urb-to-match-new-kernel-UAP.patch | 0
...-adb-Fix-build-on-big-endian-systems.patch | 0
...005-adb-Allow-adbd-to-be-run-as-root.patch | 0
.../android-tools/android-tools/adb.mk | 72 ----
.../android-tools/android-tools/adbd.mk | 247 +++++-------
...scv-Add-risc-v-Android-config-header.patch | 361 ------------------
.../0001-adb-remove-selinux-extensions.patch | 44 ---
...define-strlcpy-for-glibc-based-syste.patch | 35 --
...-Use-local-sockets-where-appropriate.patch | 70 ----
.../core/0003-adb-define-shell-command.patch | 29 --
...-adb-Fix-build-on-big-endian-systems.patch | 47 ---
.../0005-adb-add-base64-implementation.patch | 350 -----------------
.../core/0006-adb-Musl-fixes.patch | 130 -------
...sb_linux.c-fix-build-with-glibc-2.28.patch | 26 --
...008-adb-Allow-adbd-to-be-ran-as-root.patch | 23 --
...Add-dt-parameter-to-specify-DT-image.patch | 110 ------
...ux-capability.h-on-linux-systems-too.patch | 23 --
.../0011-Remove-bionic-specific-calls.patch | 64 ----
...laration-of-stlcat-strlcopy-function.patch | 50 ---
.../core/0013-adb-Support-riscv64.patch | 191 ---------
...add-u3-ss-descriptor-support-for-adb.patch | 344 -----------------
...off-most-of-sparse_file_read_normal-.patch | 60 ---
...se-Add-hole-mode-to-sparse_file_read.patch | 188 ---------
...port-for-converting-holes-to-don-t-c.patch | 114 ------
.../android-tools/core/adb_libssl_11.diff | 48 ---
.../core/b64_pton_function_decl.patch | 14 -
.../debian/Add-riscv64-support.patch | 0
.../debian/Added-missing-headers.patch | 0
.../android-tools/debian/Nonnull.patch | 0
.../android-tools/debian/Vector-cast.patch | 0
.../debian/add-missing-headers.patch | 0
.../20150704-CVE-2015-3239_dwarf_i.h.patch | 0
.../legacy_built-in_sync_functions.patch | 0
...nd-fix-strchr-conformance-to-ISO-C23.patch | 0
...unreachable-macro-to-avoid-redefinit.patch | 0
.../external/libunwind/user_pt_regs.patch | 0
.../debian/fix-attribute-issue-with-gcc.patch | 0
.../debian/fix-build-on-non-x86.patch | 0
.../fix-gettid-exception-declaration.patch | 0
.../fix-standard-namespace-errors.patch | 0
.../debian/hard-code-build-number.patch | 0
.../debian/libusb-header-path.patch | 0
.../debian/move-log-file-to-proper-dir.patch | 0
.../debian/simg_dump-python3.patch | 0
.../android-tools/debian/stdatomic.patch | 0
.../debian/stub-out-fastdeploy.patch | 0
.../system/core/Add-riscv64-support.patch | 0
.../system/core/Added-missing-headers.patch | 0
.../debian/system/core/Nonnull.patch | 0
.../debian/system/core/Vector-cast.patch | 0
.../system/core/add-missing-headers.patch | 0
...ope-write-macro-to-prevent-conflict-.patch | 0
.../core/fix-attribute-issue-with-gcc.patch | 0
.../system/core/fix-build-on-non-x86.patch | 0
.../fix-gettid-exception-declaration.patch | 0
.../core/fix-standard-namespace-errors.patch | 0
.../system/core/hard-code-build-number.patch | 0
.../system/core/libusb-header-path.patch | 0
...x-missing-fixed-width-integer-types-.patch | 0
.../core/move-log-file-to-proper-dir.patch | 0
.../system/core/simg_dump-python3.patch | 0
.../debian/system/core/stdatomic.patch | 0
.../system/core/stub-out-fastdeploy.patch | 0
.../core/throw-exception-on-unknown-os.patch | 0
.../throw-exception-on-unknown-os.patch | 0
.../android-tools/android-tools/ext4_utils.mk | 103 -----
...ext4_utils-remove-selinux-extensions.patch | 39 --
...add-o-argument-to-preserve-ownership.patch | 78 ----
...unused-parameter-from-allocate_inode.patch | 69 ----
.../android-tools/android-tools/fastboot.mk | 89 -----
.../android-tools/android-tools/gitignore | 59 ---
.../0001-Remove-bionic-specific-calls.patch | 25 --
...t-define-gettid-if-glibc-2.30-is-use.patch | 51 ---
.../android-tools/android-tools/mkbootimg.mk | 29 --
.../android-tools/android-tools/remount | 0
.../android-tools/rules_yocto.mk | 0
.../android-tools/android-tools_29.0.6.r14.bb | 7 +-
.../android-tools/android-tools_5.1.1.r37.bb | 189 ---------
91 files changed, 92 insertions(+), 3560 deletions(-)
delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf/android-gadget-setup
delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb
delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/adbd.mk
delete mode 100644 meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/10-adbd-configfs.conf
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/0001-Fixes-for-yocto-build.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/0001-liblp-fix-building-with-GCC-14.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch (100%)
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/adb.mk
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/build/0001-Riscv-Add-risc-v-Android-config-header.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0001-adb-remove-selinux-extensions.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0001-memory.h-Always-define-strlcpy-for-glibc-based-syste.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0002-adb-Use-local-sockets-where-appropriate.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0003-adb-define-shell-command.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0004-adb-Fix-build-on-big-endian-systems.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0005-adb-add-base64-implementation.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0006-adb-Musl-fixes.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0007-adb-usb_linux.c-fix-build-with-glibc-2.28.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0008-adb-Allow-adbd-to-be-ran-as-root.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0009-mkbootimg-Add-dt-parameter-to-specify-DT-image.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0010-Use-linux-capability.h-on-linux-systems-too.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0011-Remove-bionic-specific-calls.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0013-adb-Support-riscv64.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0016-libsparse-Add-hole-mode-to-sparse_file_read.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/0017-img2simg-Add-support-for-converting-holes-to-don-t-c.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/core/b64_pton_function_decl.patch
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/Add-riscv64-support.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/Added-missing-headers.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/Nonnull.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/Vector-cast.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/add-missing-headers.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/external/libunwind/libunwind-guard-unreachable-macro-to-avoid-redefinit.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/fix-build-on-non-x86.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/fix-standard-namespace-errors.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/hard-code-build-number.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/libusb-header-path.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/simg_dump-python3.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/stdatomic.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/stub-out-fastdeploy.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/Added-missing-headers.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/Nonnull.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/Vector-cast.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/add-missing-headers.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/android-tools-scope-write-macro-to-prevent-conflict-.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/hard-code-build-number.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/libusb-header-path.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/libziparchive-fix-missing-fixed-width-integer-types-.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/simg_dump-python3.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/stdatomic.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch (100%)
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/extras/0001-ext4_utils-remove-selinux-extensions.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/extras/0003-ext4_utils-drop-unused-parameter-from-allocate_inode.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/gitignore
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-Remove-bionic-specific-calls.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/remount (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools/rules_yocto.mk (100%)
rename meta-oe/{dynamic-layers/selinux/recipes-devtool => recipes-devtools}/android-tools/android-tools_29.0.6.r14.bb (96%)
delete mode 100644 meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb

--
2.34.1