StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the lib directory being used for fetching libraries." am: d118b1c2b7 am: bb038e28f9 am: e233f13870 am: a27f44ef84

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1382656

Change-Id: Ie532adbac194cad4c5b43f1ddb424823add04bcc
This commit is contained in:
Nicolas Geoffray
2020-08-03 09:30:48 +00:00
committed by Automerger Merge Worker
parent 9ef5df8fd9 a27f44ef84
commit 2ec9673711
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/build-mainline-modules.sh
View File

@@ -51,6 +51,13 @@ echo_and_run() {
"$@" "$@"
} }
lib_dir() {
case $1 in
(aosp_arm|aosp_x86) echo "lib";;
(aosp_arm64|aosp_x86_64) echo "lib64";;
esac
}
OUT_DIR=$(source build/envsetup.sh > /dev/null; TARGET_PRODUCT= get_build_var OUT_DIR) OUT_DIR=$(source build/envsetup.sh > /dev/null; TARGET_PRODUCT= get_build_var OUT_DIR)
DIST_DIR=$(source build/envsetup.sh > /dev/null; TARGET_PRODUCT= get_build_var DIST_DIR) DIST_DIR=$(source build/envsetup.sh > /dev/null; TARGET_PRODUCT= get_build_var DIST_DIR)
@@ -68,7 +75,8 @@ for product in "${PRODUCTS[@]}"; do
echo_and_run cp ${PWD}/${PRODUCT_OUT}/system/apex/${module}.apex ${DIST_DIR}/${TARGET_ARCH}/ echo_and_run cp ${PWD}/${PRODUCT_OUT}/system/apex/${module}.apex ${DIST_DIR}/${TARGET_ARCH}/
done done
for library in "${PLATFORM_LIBRARIES[@]}"; do for library in "${PLATFORM_LIBRARIES[@]}"; do
echo_and_run cp ${PWD}/${PRODUCT_OUT}/system/lib/${library}.so ${DIST_DIR}/${TARGET_ARCH}/ libdir=$(lib_dir $product)
echo_and_run cp ${PWD}/${PRODUCT_OUT}/system/${libdir}/${library}.so ${DIST_DIR}/${TARGET_ARCH}/
done done
done done