5 files changed, 100 insertions, 30 deletions

diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb
index 86b0ce0778..4d30327372 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb
@@ -3,8 +3,7 @@ SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 SRC_URI = " \
     file://android-gadget-setup \
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb
index b98c70db77..7bbac1db75 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://android-gadget-setup"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}${bindir}
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
index b719acec4c..a35428b5b4 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch
@@ -1,4 +1,4 @@
-From fe211cbc305a9316c1d4da2f086d6a50f1c92188 Mon Sep 17 00:00:00 2001
+From 194513bababa9707ec54bc7119613a0d5eca9f79 Mon Sep 17 00:00:00 2001
 From: Etienne Cordonnier <ecordonnier@snap.com>
 Date: Fri, 17 Mar 2023 10:33:11 +0100
 Subject: [PATCH] android-tools: modifications to make it build in yocto
@@ -12,27 +12,47 @@ Subject: [PATCH] android-tools: modifications to make it build in yocto
 
 Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
 
----
-Upstream-Status: Pending
+- fix warning: library search path "/usr/lib/p7zip" is unsafe for cross-compilation
 
+- fix error: include location "/usr/include/android" is unsafe for cross-compilation
+
+Upstream-Status: Pending
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ debian/development/etc1tool.mk                 |  1 -
  debian/external/boringssl/libcrypto.mk         |  1 +
+ debian/libnativehelper/libnativehelper.mk      |  1 -
+ debian/system/core/adb.mk                      |  1 -
  debian/system/core/append2simg.mk              |  2 +-
- debian/system/core/fastboot.mk                 |  2 +-
+ debian/system/core/fastboot.mk                 |  3 +--
  debian/system/core/img2simg.mk                 |  2 +-
- debian/system/core/libbacktrace.mk             |  8 ++++----
+ debian/system/core/libbacktrace.mk             | 10 ++++------
  debian/system/core/libbase.mk                  |  5 +++--
  debian/system/core/libcutils.mk                |  5 +++--
  debian/system/core/liblog.mk                   |  3 ++-
  debian/system/core/libsparse.mk                |  5 +++--
- debian/system/core/libutils.mk                 |  2 +-
+ debian/system/core/libutils.mk                 |  4 ++--
  debian/system/core/libziparchive.mk            |  5 +++--
  debian/system/core/simg2img.mk                 |  2 +-
  debian/system/core/simg2simg.mk                |  2 +-
+ debian/system/extras/libext4_utils.mk          |  1 -
  frameworks/native/libs/adbd_auth/adbd_auth.cpp |  2 ++
  system/core/adb/adb_listeners.cpp              | 12 ++++++------
  system/core/adb/transport_local.cpp            |  2 +-
- 16 files changed, 34 insertions(+), 26 deletions(-)
+ 20 files changed, 35 insertions(+), 34 deletions(-)
 
+diff --git a/debian/development/etc1tool.mk b/debian/development/etc1tool.mk
+index 2d787e98bb86..e03ac5f0048c 100644
+--- a/debian/development/etc1tool.mk
++++ b/debian/development/etc1tool.mk
+@@ -4,7 +4,6 @@ SOURCES = development/tools/etc1tool/etc1tool.cpp
+ 
+ CXXFLAGS += -std=gnu++2a
+ CPPFLAGS += \
+-  -I/usr/include/android \
+   -Idevelopment/include \
+   -Iframeworks/native/opengl/include \
+ 
 diff --git a/debian/external/boringssl/libcrypto.mk b/debian/external/boringssl/libcrypto.mk
 index c0ea54f4..b3a77bfd 100644
 --- a/debian/external/boringssl/libcrypto.mk
@@ -45,6 +65,38 @@ index c0ea54f4..b3a77bfd 100644
    -Iexternal/boringssl/src/crypto \
    -Iexternal/boringssl/src/include \
  
+diff --git a/debian/libnativehelper/libnativehelper.mk b/debian/libnativehelper/libnativehelper.mk
+index 7a0c94a6b7b5..880b2fdf9154 100644
+--- a/debian/libnativehelper/libnativehelper.mk
++++ b/debian/libnativehelper/libnativehelper.mk
+@@ -11,7 +11,6 @@ OBJECTS = $(SOURCES:.cpp=.o)
+ 
+ CXXFLAGS += -std=gnu++2a
+ CPPFLAGS += \
+-  -I/usr/include/android \
+   -Ilibnativehelper/header_only_include \
+   -Ilibnativehelper/include \
+   -Ilibnativehelper/include_jni \
+diff --git a/debian/system/core/adb.mk b/debian/system/core/adb.mk
+index 9769b68ab793..58c9a63bd225 100644
+--- a/debian/system/core/adb.mk
++++ b/debian/system/core/adb.mk
+@@ -19,7 +19,6 @@ CPPFLAGS += \
+   -D_GNU_SOURCE \
+   -DADB_HOST=1 \
+   -DADB_VERSION='"$(DEB_VERSION)"' \
+-  -I/usr/include/android \
+   -Iexternal/boringssl/include \
+   -Isystem/core/adb \
+   -Isystem/core/base/include \
+@@ -28,7 +27,6 @@ CPPFLAGS += \
+ LDFLAGS += \
+   -Ldebian/out/system/core \
+   -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -fuse-ld=gold \
+   -lbase \
+   -lcutils \
+   -lpthread \
 diff --git a/debian/system/core/append2simg.mk b/debian/system/core/append2simg.mk
 index 1599bdb8..598c751d 100644
 --- a/debian/system/core/append2simg.mk
@@ -62,15 +114,24 @@ diff --git a/debian/system/core/fastboot.mk b/debian/system/core/fastboot.mk
 index d5c9a285..a59ba1a4 100644
 --- a/debian/system/core/fastboot.mk
 +++ b/debian/system/core/fastboot.mk
-@@ -49,7 +49,7 @@ CPPFLAGS += \
+@@ -30,7 +30,6 @@ CXXFLAGS += -std=gnu++2a -fpermissive
+ CPPFLAGS += \
+    -D_FILE_OFFSET_BITS=64 \
+    -DPLATFORM_TOOLS_VERSION='"$(PLATFORM_TOOLS_VERSION)"' \
+-   -I/usr/include/android \
+    -Iexternal/boringssl/include \
+    -Iexternal/avb \
+    -Isystem/core/adb \
+@@ -49,8 +48,7 @@ CPPFLAGS += \
  
  LDFLAGS += \
    -Ldebian/out/system/core \
 -  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+-  -fuse-ld=gold \
 +  -Wl,-rpath='$$ORIGIN/../lib/android' \
-   -fuse-ld=gold \
    -lbase \
    -lcutils \
+   -lpthread \
 diff --git a/debian/system/core/img2simg.mk b/debian/system/core/img2simg.mk
 index 11adf014..8baf5ba5 100644
 --- a/debian/system/core/img2simg.mk
@@ -85,7 +146,7 @@ index 11adf014..8baf5ba5 100644
    -llog \
    -lpthread \
 diff --git a/debian/system/core/libbacktrace.mk b/debian/system/core/libbacktrace.mk
-index e3411d76..86e69874 100644
+index e3411d76..e7dd984c 100644
 --- a/debian/system/core/libbacktrace.mk
 +++ b/debian/system/core/libbacktrace.mk
 @@ -1,4 +1,4 @@
@@ -94,9 +155,11 @@ index e3411d76..86e69874 100644
  
  NAME = libbacktrace
  
-@@ -83,10 +84,9 @@ CPPFLAGS += \
+@@ -81,12 +81,10 @@ CPPFLAGS += \
+   -Isystem/core/libunwindstack/include \
+ 
  LDFLAGS += \
-   -L/usr/lib/p7zip \
+-  -L/usr/lib/p7zip \
    -Ldebian/out/system/core \
 -  -Wl,-rpath=/usr/lib/p7zip \
 -  -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
@@ -107,7 +170,7 @@ index e3411d76..86e69874 100644
    -lbase \
    -llog \
    -lpthread \
-@@ -101,7 +101,7 @@ endif
+@@ -101,7 +99,7 @@ endif
  build: $(OBJECTS_CXX) $(OBJECTS_ASSEMBLY) debian/out/external/libunwind/libunwind.a
         mkdir -p debian/out/system/core
         $(CXX) $^ -o debian/out/system/core/$(NAME).so.0 $(LDFLAGS)
@@ -216,7 +279,7 @@ index c2b2694c..2da12b8e 100644
  $(OBJECTS): %.o: %.cpp
         $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS)
 diff --git a/debian/system/core/libutils.mk b/debian/system/core/libutils.mk
-index c37b1d2d..332492c1 100644
+index c37b1d2d..0c748c8b 100644
 --- a/debian/system/core/libutils.mk
 +++ b/debian/system/core/libutils.mk
 @@ -1,4 +1,4 @@
@@ -287,6 +350,18 @@ index ed53b04c..646ab030 100644
    -lbase \
    -llog \
    -lpthread \
+diff --git a/debian/system/extras/libext4_utils.mk b/debian/system/extras/libext4_utils.mk
+index 264bb95ad36a..99125097c8e3 100644
+--- a/debian/system/extras/libext4_utils.mk
++++ b/debian/system/extras/libext4_utils.mk
+@@ -25,7 +25,6 @@ CPPFLAGS += \
+   -D_LARGEFILE64_SOURCE \
+   -DFEC_NO_KLOG \
+   -DSQUASHFS_NO_KLOG \
+-  -I/usr/include/android \
+   -Isystem/core/base/include \
+   -Isystem/core/libcutils/include \
+   -Isystem/core/libsparse/include \
 diff --git a/frameworks/native/libs/adbd_auth/adbd_auth.cpp b/frameworks/native/libs/adbd_auth/adbd_auth.cpp
 index a9c23110..6ca334ba 100644
 --- a/frameworks/native/libs/adbd_auth/adbd_auth.cpp
@@ -373,3 +448,6 @@ index c7261860..5988ec4d 100644
      auto it = local_transports.find(adb_port);
      if (it == local_transports.end()) {
          return nullptr;
+-- 
+2.34.1
+
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service
index ddf8d7f74e..b6661f2e39 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/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/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 456c7400ef..63e31e90cc 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
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
     file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \
     file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \
 "
-DEPENDS = "libbsd libpcre zlib libcap libusb squashfs-tools p7zip libselinux googletest"
+DEPENDS = "libbsd libpcre zlib libcap libusb squashfs-tools 7zip libselinux googletest"
 
 SRCREV_core = "abfd66fafcbb691d7860df059f1df1c9b1ef29da"
 
@@ -43,9 +43,9 @@ SRC_URI += " \
 
 # patches which don't come from debian
 SRC_URI += " \
-    file://rules_yocto.mk;subdir=git \
+    file://rules_yocto.mk;subdir=${BB_GIT_DEFAULT_DESTSUFFIX} \
     file://android-tools-adbd.service \
-    file://adbd.mk;subdir=git/debian/system/core \
+    file://adbd.mk;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/debian/system/core \
     file://remount \
     file://0001-Fixes-for-yocto-build.patch \
     file://0002-android-tools-modifications-to-make-it-build-in-yoct.patch \
@@ -55,7 +55,6 @@ SRC_URI += " \
     file://0001-liblp-fix-building-with-GCC-14.patch \
 "
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/${BPN}"
 
 # http://errors.yoctoproject.org/Errors/Details/1debian881/
@@ -68,6 +67,7 @@ COMPATIBLE_HOST:powerpc64le = "(null)"
 
 inherit systemd
 
+SYSTEMD_PACKAGES = "${PN}-adbd"
 SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service"
 
 # Find libbsd headers during native builds
@@ -167,7 +167,7 @@ do_install() {
 
 PACKAGES =+ "${PN}-fstools ${PN}-adbd"
 
-RDEPENDS:${BPN} = "${BPN}-conf p7zip"
+RDEPENDS:${BPN} = "${BPN}-conf 7zip"
 
 FILES:${PN}-adbd = "\
     ${bindir}/adbd \
@@ -187,9 +187,3 @@ FILES:${PN}-fstools = "\
 FILES:${PN} += "${libdir}/android ${libdir}/android/*"
 
 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)}"