LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Link clang tools' lib directory before copying clang libraries" am: cf9a57f8c6 am: 45117247f9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2446163

Change-Id: I14582f96905c9e33ee42a273abb24f7d8242c2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hsin-Yi Chen
2023-02-21 11:59:26 +00:00
committed by Automerger Merge Worker
parent 58a3bb296b 45117247f9
commit 4c70008879
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vndk/tools/header-checker/android/build-prebuilts.sh
View File

@@ -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}"