From 9a0530cb9b7f5099ba5ffae90c9a830479c4f230 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Tue, 21 Feb 2023 15:52:11 +0800 Subject: [PATCH] Link clang tools' lib directory before copying clang libraries This commit restores lib/libc++.so.1 and lib/libclang-cpp.so.16 which are indirect dependencies of clang tools. Bug: 218706358 Test: out/soong/dist/bin/versioner -h Change-Id: I3b9414645dc5b56d322d21e082feca260519d053 --- vndk/tools/header-checker/android/build-prebuilts.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vndk/tools/header-checker/android/build-prebuilts.sh b/vndk/tools/header-checker/android/build-prebuilts.sh index 317e35c70..a70bd7845 100755 --- a/vndk/tools/header-checker/android/build-prebuilts.sh +++ b/vndk/tools/header-checker/android/build-prebuilts.sh @@ -139,7 +139,10 @@ build/soong/soong_ui.bash --make-mode --skip-config --soong-only "${binaries[@]} SOONG_DIST="${SOONG_OUT}/dist" mkdir -p "${SOONG_DIST}/bin" cp "${binaries[@]}" "${SOONG_DIST}/bin" -cp -R "${SOONG_HOST_OUT}/lib"* "${SOONG_DIST}" +cp -R "${SOONG_HOST_OUT}/lib64" "${SOONG_DIST}" +# create symlink lib -> lib64 as toolchain libraries have a RUNPATH pointing to +# $ORIGIN/../lib instead of lib64 +ln -s "lib64" "${SOONG_DIST}/lib" # Copy clang header and share files CLANG_DIR="prebuilts/clang/host/${OS}-x86/${LLVM_PREBUILTS_VERSION}"