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 --- ...simg2img.mk-to-build-in-yocto-environment.patch | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch (limited to 'dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch') diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch deleted file mode 100644 index b7a72b8..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/core/0010-patching-simg2img.mk-to-build-in-yocto-environment.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 08441cf4334b911dba8c493dca3b1e2166c7d322 Mon Sep 17 00:00:00 2001 -From: Etienne Cordonnier -Date: Fri, 3 Mar 2023 13:34:34 +0100 -Subject: [PATCH 10/15] patching simg2img.mk to build in yocto environment. - -Changes include: -Introduced an output folder which will keep all the outputs from the -android-tools. - -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 - -Upstream-Status: Pending ---- - debian/simg2img.mk | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/debian/simg2img.mk b/debian/simg2img.mk -index 07fb56b4..d319c87e 100644 ---- a/debian/simg2img.mk -+++ b/debian/simg2img.mk -@@ -1,13 +1,15 @@ -+include ../../rules_yocto.mk - NAME = simg2img - SOURCES = simg2img.cpp sparse_crc32.cpp - SOURCES := $(foreach source, $(SOURCES), libsparse/$(source)) - CPPFLAGS += -Ilibsparse/include -Iinclude -std=gnu++17 --LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \ -- -Wl,-rpath-link=. \ -- -L. -lsparse -+LDFLAGS += -Wl,-rpath=$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \ -+ -Wl,-rpath-link=$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android \ -+ -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android -lsparse - - build: $(SOURCES) -- $(CXX) $^ -o libsparse/$(NAME) $(CPPFLAGS) $(LDFLAGS) -+ mkdir --parents $(OUT_DIR)/usr/bin -+ $(CXX) $^ -o $(OUT_DIR)/usr/bin/$(NAME) $(CPPFLAGS) $(LDFLAGS) - - clean: -- $(RM) libsparse/$(NAME) -+ $(RM) $(OUT_DIR)/usr/bin/$(NAME) --- -2.36.1.vfs.0.0 - -- cgit v1.2.3-54-g00ecf