diff options
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.patch | 41 |
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 @@ | |||
1 | From 4af9cc9e93e5cb09583c0fedeccae3fa195dbe7b Mon Sep 17 00:00:00 2001 | ||
2 | From: Etienne Cordonnier <ecordonnier@snap.com> | ||
3 | Date: Fri, 3 Mar 2023 13:26:08 +0100 | ||
4 | Subject: [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 | |||
10 | diff --git a/debian/libcutils.mk b/debian/libcutils.mk | ||
11 | index 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 | -- | ||
40 | 2.36.1.vfs.0.0 | ||
41 | |||