diff mbox series

[meta-oe,1/2] android-tools: drop useless USB_DEBUGGING_ENABLED handling

Message ID 20250209234518.1549197-1-dmitry.baryshkov@linaro.org
State Accepted
Headers show
Series [meta-oe,1/2] android-tools: drop useless USB_DEBUGGING_ENABLED handling | expand

Commit Message

Dmitry Baryshkov Feb. 9, 2025, 11:45 p.m. UTC 
This reverts commits 4271cc28279b ("android-tools: Add flag to enable
adbd service (#147)") and b85ae59968f4 ("android-tools 10: Add flag to
enable adbd service"). These two commits added optional
ROOTFS_POSTPROCESS_COMMAND touching the flag file, however this variable
doesn't make any sense in the package recipe, it is only concerned in
the image context.

Drop useless code from the android-tools recipe.

Fixes: 4271cc28279b ("android-tools: Add flag to enable adbd service (#147)")
Fixes: b85ae59968f4 ("android-tools 10: Add flag to enable adbd service")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../android-tools/android-tools_29.0.6.r14.bb               | 6 ------
 .../android-tools/android-tools_5.1.1.r37.bb                | 6 ------
 2 files changed, 12 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
index ee665bb15147..cd3c54e32e11 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
@@ -188,9 +188,3 @@  FILES:${PN}-fstools = "\
 FILES:${PN} += "${libdir}/android ${libdir}/android/*"
 
 BBCLASSEXTEND = "native"
-
-android_tools_enable_devmode() {
-    touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled
-}
-
-ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}"
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 a291fc39a2c8..7c27efb09356 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
@@ -188,12 +188,6 @@  FILES:${PN}-fstools = "\
 
 BBCLASSEXTEND = "native"
 
-android_tools_enable_devmode() {
-    touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled
-}
-
-ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}"
-
 # http://errors.yoctoproject.org/Errors/Details/766881/
 # android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:23: error: passing argument 2 of 'RSA_get0_key' from incompatible pointer type [-Wincompatible-pointer-types]
 # android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:27: error: passing argument 3 of 'RSA_get0_key' from incompatible pointer type [-Wincompatible-pointer-types]