diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2024-09-05 13:56:33 +0300 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-09-05 08:20:29 -0700 |
| commit | 2a3d4be9994ec68f2d94f8a7dd7da77c1675dfe6 (patch) | |
| tree | 6225ad1b85dd87b5246222e02914a4015b76925d | |
| parent | 0a3770063247b309ee68781750be5eddcab48ed7 (diff) | |
| download | meta-openembedded-2a3d4be9994ec68f2d94f8a7dd7da77c1675dfe6.tar.gz | |
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 <quic_raghuvar@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb | 2 | ||||
| -rw-r--r-- | 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/*" | |||
| 190 | BBCLASSEXTEND = "native" | 190 | BBCLASSEXTEND = "native" |
| 191 | 191 | ||
| 192 | android_tools_enable_devmode() { | 192 | android_tools_enable_devmode() { |
| 193 | touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled | 193 | touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" | 196 | 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 = "\ | |||
| 189 | BBCLASSEXTEND = "native" | 189 | BBCLASSEXTEND = "native" |
| 190 | 190 | ||
| 191 | android_tools_enable_devmode() { | 191 | android_tools_enable_devmode() { |
| 192 | touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled | 192 | touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" | 195 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" |