android-tools: fix incremental builds by using ln -sf

This avoids an error about the file already existing when debugging the recipe and starting incremental builds. Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
author: Etienne Cordonnier <ecordonnier@snap.com> 2023-03-02 12:01:03 +0100
committer: Khem Raj <raj.khem@gmail.com> 2023-03-06 10:21:29 -0800
commit: 9e2fc3d078c8568abb524e3e1f38a21c0f97c4da (patch)
tree: dd99937cfac0bff8a3ad8ad5259f7c596b8fb10f /dynamic-layers
parent: bb3c933575b442297ac7292e8e9926d777627596 (diff)
download: meta-clang-9e2fc3d078c8568abb524e3e1f38a21c0f97c4da.tar.gz
12 files changed, 12 insertions, 12 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch
index 7094cca..21598b1 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch
@@ -38,7 +38,7 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
 -       $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 -       ln -s $(NAME).so.0 $(NAME).so
 +       $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
-+       ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 
 transport_mdns_unsupported.cpp:
        echo 'void init_mdns_transport_discovery(void) {}' > transport_mdns_unsupported.cpp
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch
index 8115170..6ae9793 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch
@@ -48,7 +48,7 @@ Upstream-Status: Pending
 -       $(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 -s $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(NAME).so
+       ln -sf $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(NAME).so
 
 clean:
 -       $(RM) $(COBJECTS) $(CXXOBJECTS) $(NAME).so*
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
index 37c93d6..ca56f8c 100644
--- 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
@@ -25,7 +25,7 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
 -       $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 -       ln -s $(NAME).so.0 $(NAME).so
 +       $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
-+       ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r base/include/* $(OUT_DIR)/usr/include/
 
 clean:
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libcrypto_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libcrypto_mk_change_out_dir.patch
index f705909..642d6d3 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libcrypto_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libcrypto_mk_change_out_dir.patch
@@ -26,5 +26,5 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
 +       mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ 
 +       mkdir --parents $(OUT_DIR)/usr/include
 +       $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DOPENSSL_NO_ASM
-+       ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r include/openssl $(OUT_DIR)/usr/include
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch
index a0dd348..db613df 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch
@@ -30,7 +30,7 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
 -       $(CC) $^ -o $(NAME).so.0  $(CPPFLAGS) $(LDFLAGS)
 -       ln -s $(NAME).so.0 $(NAME).so
 +       $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0  $(CPPFLAGS) $(LDFLAGS)
-+       ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r libcrypto_utils/include/* $(OUT_DIR)/usr/include/
 
 clean:
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libcutils_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libcutils_mk_change_out_dir.patch
index 5539eb9..4914654 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libcutils_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libcutils_mk_change_out_dir.patch
@@ -16,7 +16,7 @@
 -       $(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 -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r libcutils/include/cutils $(OUT_DIR)/usr/include/  
 
 clean:
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libext4_utils_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libext4_utils_mk_change_out_dir.patch
index efccfab..0c31e5d 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libext4_utils_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libext4_utils_mk_change_out_dir.patch
@@ -37,6 +37,6 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
 -       ln -s $(NAME).so.0 $(OUT_DIR)/$(NAME).so
 +       mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/       
 +       $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-+       ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r ext4_utils/include/* $(OUT_DIR)/usr/include/
 +
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch
index 0f8184d..6e63e4f 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch
@@ -24,7 +24,7 @@
 -       ln -s $(NAME).so.0 $(OUT_DIR)/$(NAME).so
 +       mkdir -p $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android
 +       $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
-+       ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r libfec/include/* $(OUT_DIR)/usr/include/
 
 clean:
diff --git a/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch
index 09ef187..38cfa88 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch
@@ -31,7 +31,7 @@ Upstream-Status: Pending
 -       $(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 -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r liblog/include/* $(OUT_DIR)/usr/include/  
 
 clean:
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libsparse_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libsparse_mk_change_out_dir.patch
index 4f8bb44..bf439ef 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libsparse_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libsparse_mk_change_out_dir.patch
@@ -37,7 +37,7 @@ Upstream-Status: Pending
 -       $(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 -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so  
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so 
 
 clean:
 -       $(RM) $(CXXOBJECTS) $(COBJECTS) $(NAME).so*
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch
index 237d45c..f560381 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch
@@ -42,6 +42,6 @@ Upstream-Status: Pending
 +       mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/ 
 +       mkdir --parents $(OUT_DIR)/usr/include/android/libunwind
 +       $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Wno-header-guard -Wno-absolute-value
-+       ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r include/* debian/include/* $(OUT_DIR)/usr/include/android/libunwind/
 +
diff --git a/dynamic-layers/selinux/android-tools/android-tools/libziparchive_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libziparchive_mk_change_out_dir.patch
index cc9997d..4f88b0a 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libziparchive_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libziparchive_mk_change_out_dir.patch
@@ -39,7 +39,7 @@ Upstream-Status: Pending
 -       $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
 -       ln -s $(NAME).so.0 $(NAME).so
 +       $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)   
-+       ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
+       ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
 +       cp -r libziparchive/include/* $(OUT_DIR)/usr/include/
 
 clean:
author	Etienne Cordonnier <ecordonnier@snap.com>	2023-03-02 12:01:03 +0100
committer	Khem Raj <raj.khem@gmail.com>	2023-03-06 10:21:29 -0800
commit	9e2fc3d078c8568abb524e3e1f38a21c0f97c4da (patch)
tree	dd99937cfac0bff8a3ad8ad5259f7c596b8fb10f /dynamic-layers
parent	bb3c933575b442297ac7292e8e9926d777627596 (diff)
download	meta-clang-9e2fc3d078c8568abb524e3e1f38a21c0f97c4da.tar.gz

diff --git a/dynamic-layers/selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch index 7094cca..21598b1 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch
@@ -38,7 +38,7 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
38	- $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)	38	- $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
39	- ln -s $(NAME).so.0 $(NAME).so	39	- ln -s $(NAME).so.0 $(NAME).so
40	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)	40	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
41	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	41	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
42		42
43	transport_mdns_unsupported.cpp:	43	transport_mdns_unsupported.cpp:
44	echo 'void init_mdns_transport_discovery(void) {}' > transport_mdns_unsupported.cpp	44	echo 'void init_mdns_transport_discovery(void) {}' > transport_mdns_unsupported.cpp


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch index 8115170..6ae9793 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch
@@ -48,7 +48,7 @@ Upstream-Status: Pending
48	- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)	48	- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)
49	- ln -s $(NAME).so.0 $(NAME).so	49	- ln -s $(NAME).so.0 $(NAME).so
50	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)	50	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
51	+ ln -s $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(NAME).so	51	+ ln -sf $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(NAME).so
52		52
53	clean:	53	clean:
54	- $(RM) $(COBJECTS) $(CXXOBJECTS) $(NAME).so*	54	- $(RM) $(COBJECTS) $(CXXOBJECTS) $(NAME).so*


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 index 37c93d6..ca56f8c 100644 --- 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
@@ -25,7 +25,7 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
25	- $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)	25	- $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
26	- ln -s $(NAME).so.0 $(NAME).so	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)	27	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
28	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	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/	29	+ cp -r base/include/* $(OUT_DIR)/usr/include/
30		30
31	clean:	31	clean:


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libcrypto_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libcrypto_mk_change_out_dir.patch index f705909..642d6d3 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libcrypto_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libcrypto_mk_change_out_dir.patch
@@ -26,5 +26,5 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
26	+ mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/	26	+ mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/
27	+ mkdir --parents $(OUT_DIR)/usr/include	27	+ mkdir --parents $(OUT_DIR)/usr/include
28	+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DOPENSSL_NO_ASM	28	+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DOPENSSL_NO_ASM
29	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	29	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
30	+ cp -r include/openssl $(OUT_DIR)/usr/include	30	+ cp -r include/openssl $(OUT_DIR)/usr/include


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch index a0dd348..db613df 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch
@@ -30,7 +30,7 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
30	- $(CC) $^ -o $(NAME).so.0 $(CPPFLAGS) $(LDFLAGS)	30	- $(CC) $^ -o $(NAME).so.0 $(CPPFLAGS) $(LDFLAGS)
31	- ln -s $(NAME).so.0 $(NAME).so	31	- ln -s $(NAME).so.0 $(NAME).so
32	+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CPPFLAGS) $(LDFLAGS)	32	+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CPPFLAGS) $(LDFLAGS)
33	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	33	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
34	+ cp -r libcrypto_utils/include/* $(OUT_DIR)/usr/include/	34	+ cp -r libcrypto_utils/include/* $(OUT_DIR)/usr/include/
35		35
36	clean:	36	clean:


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libcutils_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libcutils_mk_change_out_dir.patch index 5539eb9..4914654 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libcutils_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libcutils_mk_change_out_dir.patch
@@ -16,7 +16,7 @@
16	- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)	16	- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)
17	- ln -s $(NAME).so.0 $(NAME).so	17	- ln -s $(NAME).so.0 $(NAME).so
18	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)	18	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
19	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	19	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
20	+ cp -r libcutils/include/cutils $(OUT_DIR)/usr/include/	20	+ cp -r libcutils/include/cutils $(OUT_DIR)/usr/include/
21		21
22	clean:	22	clean:


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libext4_utils_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libext4_utils_mk_change_out_dir.patch index efccfab..0c31e5d 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libext4_utils_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libext4_utils_mk_change_out_dir.patch
@@ -37,6 +37,6 @@ Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
37	- ln -s $(NAME).so.0 $(OUT_DIR)/$(NAME).so	37	- ln -s $(NAME).so.0 $(OUT_DIR)/$(NAME).so
38	+ mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/	38	+ mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/
39	+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)	39	+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
40	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	40	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
41	+ cp -r ext4_utils/include/* $(OUT_DIR)/usr/include/	41	+ cp -r ext4_utils/include/* $(OUT_DIR)/usr/include/
42	+	42	+


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch index 0f8184d..6e63e4f 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch
@@ -24,7 +24,7 @@
24	- ln -s $(NAME).so.0 $(OUT_DIR)/$(NAME).so	24	- ln -s $(NAME).so.0 $(OUT_DIR)/$(NAME).so
25	+ mkdir -p $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android	25	+ mkdir -p $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android
26	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)	26	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
27	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	27	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
28	+ cp -r libfec/include/* $(OUT_DIR)/usr/include/	28	+ cp -r libfec/include/* $(OUT_DIR)/usr/include/
29		29
30	clean:	30	clean:


diff --git a/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch index 09ef187..38cfa88 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch
@@ -31,7 +31,7 @@ Upstream-Status: Pending
31	- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)	31	- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)
32	- ln -s $(NAME).so.0 $(NAME).so	32	- ln -s $(NAME).so.0 $(NAME).so
33	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)	33	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
34	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	34	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
35	+ cp -r liblog/include/* $(OUT_DIR)/usr/include/	35	+ cp -r liblog/include/* $(OUT_DIR)/usr/include/
36		36
37	clean:	37	clean:


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libsparse_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libsparse_mk_change_out_dir.patch index 4f8bb44..bf439ef 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libsparse_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libsparse_mk_change_out_dir.patch
@@ -37,7 +37,7 @@ Upstream-Status: Pending
37	- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)	37	- $(CXX) $^ -o $(NAME).so.0 $(LDFLAGS)
38	- ln -s $(NAME).so.0 $(NAME).so	38	- ln -s $(NAME).so.0 $(NAME).so
39	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)	39	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(LDFLAGS)
40	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	40	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
41		41
42	clean:	42	clean:
43	- $(RM) $(CXXOBJECTS) $(COBJECTS) $(NAME).so*	43	- $(RM) $(CXXOBJECTS) $(COBJECTS) $(NAME).so*


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch index 237d45c..f560381 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libunwind_mk_change_out_dir.patch
@@ -42,6 +42,6 @@ Upstream-Status: Pending
42	+ mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/	42	+ mkdir --parents $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/
43	+ mkdir --parents $(OUT_DIR)/usr/include/android/libunwind	43	+ mkdir --parents $(OUT_DIR)/usr/include/android/libunwind
44	+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Wno-header-guard -Wno-absolute-value	44	+ $(CC) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Wno-header-guard -Wno-absolute-value
45	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	45	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
46	+ cp -r include/* debian/include/* $(OUT_DIR)/usr/include/android/libunwind/	46	+ cp -r include/* debian/include/* $(OUT_DIR)/usr/include/android/libunwind/
47	+	47	+


diff --git a/dynamic-layers/selinux/android-tools/android-tools/libziparchive_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libziparchive_mk_change_out_dir.patch index cc9997d..4f88b0a 100644 --- a/dynamic-layers/selinux/android-tools/android-tools/libziparchive_mk_change_out_dir.patch +++ b/dynamic-layers/selinux/android-tools/android-tools/libziparchive_mk_change_out_dir.patch
@@ -39,7 +39,7 @@ Upstream-Status: Pending
39	- $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)	39	- $(CXX) $^ -o $(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
40	- ln -s $(NAME).so.0 $(NAME).so	40	- ln -s $(NAME).so.0 $(NAME).so
41	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)	41	+ $(CXX) $^ -o $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so.0 $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS)
42	+ ln -s $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so	42	+ ln -sf $(NAME).so.0 $(OUT_DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/android/$(NAME).so
43	+ cp -r libziparchive/include/* $(OUT_DIR)/usr/include/	43	+ cp -r libziparchive/include/* $(OUT_DIR)/usr/include/
44		44
45	clean:	45	clean: