From f23054f668663bce274e45e5571b60cc648a49dc Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 31 Jul 2020 15:36:39 +0100 Subject: [PATCH] Fix the lib directory being used for fetching libraries. On 64bit archs, it needs to be lib64. Test: scripts/build-mainline-modules.sh Bug: 142935992 Change-Id: I049cfc39704c34c32f79edc7cc49d5f7f29f0ac2 --- scripts/build-mainline-modules.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/build-mainline-modules.sh b/scripts/build-mainline-modules.sh index 0520d31e6..c7baca70d 100755 --- a/scripts/build-mainline-modules.sh +++ b/scripts/build-mainline-modules.sh @@ -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) 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}/ done 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