From 2a3d4be9994ec68f2d94f8a7dd7da77c1675dfe6 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 5 Sep 2024 13:56:33 +0300 Subject: android-tools: create flag flag file for adbd at a proper location The patches by Raghuvarya changed the location of the file that systemd uses to check whether to start the adbd or not. However those patches completely ignored creating those two flag files, as done by the android-tools recipes. Make the android-tools create the /etc/usb-debugging-enabled file so that it's possible to enable the adbd automatically. Fixes: a29c6386d576 ("android-toold-adbd: Fix inconsistency between selinux configurations") Fixes: 8106cfe769aa ("android-tools-adbd.service: Change /var to /etc in ConditionPathExists") Cc: Raghuvarya S Signed-off-by: Dmitry Baryshkov Signed-off-by: Khem Raj --- .../selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb | 2 +- meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 18068478f8..d2680b4578 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 @@ -190,7 +190,7 @@ FILES:${PN} += "${libdir}/android ${libdir}/android/*" BBCLASSEXTEND = "native" android_tools_enable_devmode() { - touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled + 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 198ef281f2..a291fc39a2 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 @@ -189,7 +189,7 @@ FILES:${PN}-fstools = "\ BBCLASSEXTEND = "native" android_tools_enable_devmode() { - touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled + touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled } ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" -- cgit v1.2.3-54-g00ecf