aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/core/0011-patching-liblog.mk-to-build-in-yocto-environment.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/core/0011-patching-liblog.mk-to-build-in-yocto-environment.patch')
-rw-r--r--meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/core/0011-patching-liblog.mk-to-build-in-yocto-environment.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/core/0011-patching-liblog.mk-to-build-in-yocto-environment.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/core/0011-patching-liblog.mk-to-build-in-yocto-environment.patch
deleted file mode 100644
index 7a37757bd8..0000000000
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/core/0011-patching-liblog.mk-to-build-in-yocto-environment.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 99e46ec157e6fb912258ac6506896196e53d790b Mon Sep 17 00:00:00 2001
-From: Etienne Cordonnier <ecordonnier@snap.com>
-Date: Fri, 3 Mar 2023 13:35:44 +0100
-Subject: [PATCH 11/15] patching liblog.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 <Nisha.Parrakat@kpit.com>
-
-Upstream-Status: Pending
----
- debian/liblog.mk | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/debian/liblog.mk b/debian/liblog.mk
-index eb1909b9..3b40d710 100644
---- a/debian/liblog.mk
-+++ b/debian/liblog.mk
-@@ -1,3 +1,4 @@
-+include ../../rules_yocto.mk
- NAME = liblog
-
- # copied from liblog/Android.bp
-@@ -39,11 +40,12 @@ CPPFLAGS += \
- LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 -lpthread
-
- build: $(COBJECTS) $(CXXOBJECTS)
-- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)
-- ln -s $(NAME).so.0 $(NAME).so
-+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
-+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
-+ cp -r liblog/include/* $(OUT_DIR)/usr/include/
-
- clean:
-- $(RM) $(COBJECTS) $(CXXOBJECTS) $(NAME).so*
-+ $(RM) $(COBJECTS) $(CXXOBJECTS) $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so*
-
- $(COBJECTS): %.o: %.c
- $(CC) $< -o $@ $(CFLAGS) $(CPPFLAGS)
---
-2.36.1.vfs.0.0
-