From 0c7dbd7eefd775303e1a29b5466fb9aa3ed4d838 Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier Date: Wed, 15 Mar 2023 17:40:37 +0100 Subject: android-tools: remove recipe and dynamic-layer The recipe has been patched to remove the clang dependency and moved to meta-openembedded at https://github.com/openembedded/meta-openembedded/tree/master/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools Signed-off-by: Etienne Cordonnier --- ...odifications-to-make-it-build-in-yocto-en.patch | 56 ---------------------- 1 file changed, 56 deletions(-) delete mode 100644 dynamic-layers/selinux/android-tools/android-tools/core/0002-libadb.mk-modifications-to-make-it-build-in-yocto-en.patch (limited to 'dynamic-layers/selinux/android-tools/android-tools/core/0002-libadb.mk-modifications-to-make-it-build-in-yocto-en.patch') diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0002-libadb.mk-modifications-to-make-it-build-in-yocto-en.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0002-libadb.mk-modifications-to-make-it-build-in-yocto-en.patch deleted file mode 100644 index 1281caa..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/core/0002-libadb.mk-modifications-to-make-it-build-in-yocto-en.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f802e7685cfbdd66d74da2975b3a1c6d77f1a2de Mon Sep 17 00:00:00 2001 -From: Etienne Cordonnier -Date: Fri, 3 Mar 2023 12:28:10 +0100 -Subject: [PATCH 02/15] libadb.mk: modifications to make it build in yocto - environment - -Adding an include file that is setting the common flags. -Changed the cppflag to include the headers from other components -of android-tools - -Modified LDflags so that the libraries that are coming from other android-tools -are searched in the output folder. - -Modified the build rule so that it outputs the binary to the OUT_DIR - -Signed-off-by: Nisha Parrakat ---- - debian/libadb.mk | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/debian/libadb.mk b/debian/libadb.mk -index ae240c98..db5da353 100644 ---- a/debian/libadb.mk -+++ b/debian/libadb.mk -@@ -1,3 +1,4 @@ -+include ../../rules_yocto.mk - NAME := libadb - - LIBADB_SRC_FILES := \ -@@ -43,18 +44,18 @@ CPPFLAGS += \ - -Ibase/include \ - -Idiagnose_usb/include \ - -Ilibcrypto_utils/include \ -- -Iinclude \ -+ -Iinclude -I$(OUT_DIR)/usr/include \ - -DPLATFORM_TOOLS_VERSION='"$(PLATFORM_TOOLS_VERSION)"' \ - -DADB_HOST=1 -DADB_VERSION='"$(DEB_VERSION)"' - - LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \ - -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ -- -L/usr/lib/$(DEB_HOST_MULTIARCH)/android -lcrypto \ -- -lpthread -L. -lbase -lcutils -lcrypto_utils -lusb-1.0 -+ -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android -lcrypto \ -+ -lpthread -lbase -lcutils -lcrypto_utils -lusb-1.0 - - $(NAME).so: $(SOURCES) -- $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -- ln -s $(NAME).so.0 $(NAME).so -+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so - - transport_mdns_unsupported.cpp: - echo 'void init_mdns_transport_discovery(void) {}' > transport_mdns_unsupported.cpp --- -2.36.1.vfs.0.0 - -- cgit v1.2.3-54-g00ecf