summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/selinux/android-tools/android-tools/core/0008-libcutils-modifications-to-make-it-build-in-yocto-en.patch
diff options
context:
space:
mode:
authorEtienne Cordonnier <ecordonnier@snap.com>2023-03-15 17:40:37 +0100
committerKhem Raj <raj.khem@gmail.com>2023-03-15 15:25:12 -0700
commit0c7dbd7eefd775303e1a29b5466fb9aa3ed4d838 (patch)
tree22a291b1e4ee7fa4ebd1186f8fd31e0fe1227f37 /dynamic-layers/selinux/android-tools/android-tools/core/0008-libcutils-modifications-to-make-it-build-in-yocto-en.patch
parent204dadaf378e44d6c53d3bee1c2a54aaf38d666c (diff)
downloadmeta-clang-0c7dbd7eefd775303e1a29b5466fb9aa3ed4d838.tar.gz
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 <ecordonnier@snap.com>
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/core/0008-libcutils-modifications-to-make-it-build-in-yocto-en.patch')
-rw-r--r--dynamic-layers/selinux/android-tools/android-tools/core/0008-libcutils-modifications-to-make-it-build-in-yocto-en.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/core/0008-libcutils-modifications-to-make-it-build-in-yocto-en.patch b/dynamic-layers/selinux/android-tools/android-tools/core/0008-libcutils-modifications-to-make-it-build-in-yocto-en.patch
deleted file mode 100644
index b876229..0000000
--- a/dynamic-layers/selinux/android-tools/android-tools/core/0008-libcutils-modifications-to-make-it-build-in-yocto-en.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 4af9cc9e93e5cb09583c0fedeccae3fa195dbe7b Mon Sep 17 00:00:00 2001
2From: Etienne Cordonnier <ecordonnier@snap.com>
3Date: Fri, 3 Mar 2023 13:26:08 +0100
4Subject: [PATCH 08/15] libcutils: modifications to make it build in yocto
5 environment
6---
7 debian/libcutils.mk | 10 ++++++----
8 1 file changed, 6 insertions(+), 4 deletions(-)
9
10diff --git a/debian/libcutils.mk b/debian/libcutils.mk
11index 7cd18d87..bb45fb57 100644
12--- a/debian/libcutils.mk
13+++ b/debian/libcutils.mk
14@@ -1,3 +1,4 @@
15+include ../../rules_yocto.mk
16 NAME = libcutils
17
18 # copied from libcutils/Android.bp
19@@ -50,14 +51,15 @@ CPPFLAGS += \
20 -Iinclude \
21
22 LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 \
23- -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android -lpthread -L. -llog -lbase
24+ -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android -lpthread -L$(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ -llog -lbase
25
26 build: $(COBJECTS) $(CXXOBJECTS)
27- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)
28- ln -s $(NAME).so.0 $(NAME).so
29+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
30+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
31+ cp -r libcutils/include/cutils $(OUT_DIR)/usr/include/
32
33 clean:
34- $(RM) $(CXXOBJECTS) $(COBJECTS) $(NAME).so*
35+ $(RM) $(CXXOBJECTS) $(COBJECTS) $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so*
36
37 $(COBJECTS): %.o: %.c
38 $(CC) $< -o $@ $(CFLAGS) $(CPPFLAGS)
39--
402.36.1.vfs.0.0
41