From 9e2fc3d078c8568abb524e3e1f38a21c0f97c4da Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier Date: Thu, 2 Mar 2023 12:01:03 +0100 Subject: 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 --- .../selinux/android-tools/android-tools/libadb_mk_change_out_dir.patch | 2 +- .../android-tools/android-tools/libbacktrace_mk_change_out_dir.patch | 2 +- .../selinux/android-tools/android-tools/libbase_mk_change_out_dir.patch | 2 +- .../android-tools/android-tools/libcrypto_mk_change_out_dir.patch | 2 +- .../android-tools/android-tools/libcrypto_utils_mk_change_out_dir.patch | 2 +- .../android-tools/android-tools/libcutils_mk_change_out_dir.patch | 2 +- .../android-tools/android-tools/libext4_utils_mk_change_out_dir.patch | 2 +- .../selinux/android-tools/android-tools/libfec_mk_change_out_dir.patch | 2 +- .../selinux/android-tools/android-tools/liblog_mk_change_out_dir.patch | 2 +- .../android-tools/android-tools/libsparse_mk_change_out_dir.patch | 2 +- .../android-tools/android-tools/libunwind_mk_change_out_dir.patch | 2 +- .../android-tools/android-tools/libziparchive_mk_change_out_dir.patch | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'dynamic-layers') 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 - $(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 - $(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 + 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 - $(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 - 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: -- cgit v1.2.3-54-g00ecf