diff options
author | Etienne Cordonnier <ecordonnier@snap.com> | 2023-03-03 11:26:18 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-03-07 15:08:02 -0800 |
commit | 33604a56dc35a04c6b4233f2030cebc60e8dcfe9 (patch) | |
tree | e9c96ec6f78d035420069e76a2b41d438a7b135e /dynamic-layers/selinux/android-tools/android-tools/libbase_mk_change_out_dir.patch | |
parent | 398d4bc3805ca1c5cbb845aacccdb8999aabeab4 (diff) | |
download | meta-clang-33604a56dc35a04c6b4233f2030cebc60e8dcfe9.tar.gz |
android-tools: make it work with devtool
devtool modify android-tools was failing with an error:
- regenerate patches in the git format working with devtool
- add debian patches to yocto instead of applying them manually with do_unpack_and_patch_debian,
to make it work with devtool
Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/libbase_mk_change_out_dir.patch')
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools/libbase_mk_change_out_dir.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libbase_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libbase_mk_change_out_dir.patch deleted file mode 100644 index ca56f8c..0000000 --- a/dynamic-layers/selinux/android-tools/android-tools/libbase_mk_change_out_dir.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | libbase.mk: modifications to make it build in yocto environment | ||
2 | |||
3 | Adding an include file that is setting the common flags. | ||
4 | Changed the cppflag to include the headers from other components | ||
5 | of android-tools | ||
6 | |||
7 | Modified LDflags so that the libraries that are coming from other android-tools | ||
8 | are searched in the output folder. | ||
9 | |||
10 | Modified the build rule so that it outputs the binary to the OUT_DIR | ||
11 | |||
12 | Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> | ||
13 | |||
14 | --- git/system/core/debian/libbase.mk 2021-04-29 22:01:13.664181133 +0200 | ||
15 | +++ git/system/core/debian/libbase.mk 2021-04-29 22:04:52.328123833 +0200 | ||
16 | @@ -1,3 +1,4 @@ | ||
17 | +include ../../rules_yocto.mk | ||
18 | NAME = libbase | ||
19 | SOURCES = \ | ||
20 | chrono_utils.cpp \ | ||
21 | @@ -20,8 +21,9 @@ | ||
22 | LDFLAGS += -shared -Wl,-soname,$(NAME).so.0 | ||
23 | |||
24 | build: $(SOURCES) | ||
25 | - $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) | ||
26 | - ln -s $(NAME).so.0 $(NAME).so | ||
27 | + $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) | ||
28 | + ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so | ||
29 | + cp -r base/include/* $(OUT_DIR)/usr/include/ | ||
30 | |||
31 | clean: | ||
32 | - $(RM) $(NAME).so* | ||
33 | + $(RM) $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so* | ||