Re: [meta-oe][PATCH v3 0/3] android-tools: migration and cleanup

["AshishKumar Mishra" <ashishkumar.mishra@bmwtechworks.in>]

[-- Attachment #1.1: Type: text/plain, Size: 1623 bytes --]

Hi Khem / Gyorgy & Team,

This issue was specific to CLANG, and it reported the error as it was being passed header files in compilation command

I have created a fix attached below, would requires teams comment/ feedback on below before i sent RFC-V4.

1) Tested in two separate build one with gcc (default + qemuarm64) another with clang + qemuarm64
Compiled android-tools locally and the added in core-image-minimal & t ested the adb on qemu target
Local.conf (for clang check)
MACHINE = "qemuarm64"
PREFERRED_PROVIDER_virtual/cc = "clang"
PREFERRED_PROVIDER_virtual/cxx = "clang"
TOOLCHAIN = "clang"

#PREFERRED_PROVIDER_llvm = "clang"
#PREFERRED_PROVIDER_llvm-native = "clang-native"
#PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang"
#PROVIDES:pn-clang = "llvm"
#PROVIDES:pn-clang-native = "llvm-native"
#PROVIDES:pn-nativesdk-clang = "nativesdk-llvm"
IMAGE_INSTALL:append = " android-tools"
EXTRA_IMAGE_FEATURES += "allow-empty-password empty-root-password allow-root-login"

root@qemuarm64:~# /bin/adb --version
Android Debug Bridge version 1.0.41
Version -debian
Installed as /usr/bin/adb
root@qemuarm64:~#

2) Can team please confirm if this is sufficient or there is any other test which i could do before sharing the RFC-v4
Idea is to avoid last minute build error like this coming at CI-CD?

3) Going ahead should i check with clang also for every patch which needs to be send upstream ?
This could save teams/ maintainers effort

Attached is the patch for team reference which if team is fine (with approach and above testing) , will share in RFC-V4

Thanks,
Ashish

[-- Attachment #1.2: Type: text/html, Size: 11287 bytes --]

[-- Attachment #2: 0001-android-tools-fix-deprecated-header-warning-from-cla.patch --]
[-- Type: application/octet-stream, Size: 2488 bytes --]

From 79c1f0878dc11d550be3a435eeaa601b40919ea6 Mon Sep 17 00:00:00 2001
From: Ashish Kumar Mishra <ashishkumar.mishra@bmwtechworks.in>
Date: Sun, 17 May 2026 07:54:25 +0000
Subject: [PATCH] android-tools: fix deprecated header warning from clang

Remove .h header files from the SOURCES compilation list inside adbd.mk
to resolve a Clang warning regarding treating 'c-header' input as 'c++-header'

Moved the header files into a separate HEADERS variable to act purely as a
GNU Make dependency trigger, keeping them off the direct compiler
execution string.

Signed-off-by: Ashish Kumar Mishra <ashishkumar.mishra@bmwtechworks.in>
---
 .../android-tools/android-tools/adbd.mk           | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk b/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
index 3282216b8e..709a166887 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
@@ -5,16 +5,12 @@ SOURCES = \
 	adb/adbconnection/adbconnection_server.cpp \
 	adb/daemon/auth.cpp \
 	adb/daemon/file_sync_service.cpp \
-	adb/daemon/file_sync_service.h \
 	adb/daemon/framebuffer_service.cpp \
-	adb/daemon/framebuffer_service.h \
 	adb/daemon/jdwp_service.cpp \
 	adb/daemon/main.cpp \
 	adb/daemon/restart_service.cpp \
-	adb/daemon/restart_service.h \
 	adb/daemon/services.cpp \
 	adb/daemon/shell_service.cpp \
-	adb/daemon/shell_service.h \
 	adb/daemon/usb_ffs.cpp \
 	adb/daemon/usb_legacy.cpp \
 	adb/daemon/usb.cpp \
@@ -41,7 +37,14 @@ SOURCES = \
 	diagnose_usb/diagnose_usb.cpp \
 	libasyncio/AsyncIO.cpp \
 
+HEADERS = \
+        adb/daemon/file_sync_service.h \
+        adb/daemon/framebuffer_service.h \
+        adb/daemon/restart_service.h \
+        adb/daemon/shell_service.h
+
 SOURCES := $(foreach source, $(SOURCES), system/core/$(source))
+HEADERS := $(foreach header, $(HEADERS), system/core/$(header))
 
 SOURCES += \
     frameworks/native/libs/adbd_auth/adbd_auth.cpp
@@ -79,9 +82,9 @@ ifneq ($(filter armel mipsel,$(DEB_HOST_ARCH)),)
   LDFLAGS += -latomic
 endif
 
-build: $(SOURCES)
+build: $(SOURCES) $(HEADERS)
 	mkdir --parents debian/out/system/core
-	$(CXX) $^ -o debian/out/system/core/adbd $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
+	$(CXX) $(SOURCES) -o debian/out/system/core/adbd $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 
 clean:
 	$(RM) debian/out/system/core/adbd
-- 
2.43.0