commit 504357370b8a0f9938a751bccd8dc6f520678cea
author Nicolas Geoffray <ngeoffray@google.com> Mon Aug 03 09:55:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 03 09:55:08 2020 +0000
tree b880e0cb3fb5edf27a58fdf98b59ff2138c5bb4e
parent a7323d483dc39bda280ce9eb7fb8b001a769c4a0
parent 2ec96737114a7c096be9bd2dfe51190f5f6156ed

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

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

Change-Id: Ib6f054f18972130bf4e9da401816e89e1e7a3cd6

scripts/build-mainline-modules.sh

diff --git a/scripts/build-mainline-modules.sh b/scripts/build-mainline-modules.sh
index 0520d31..c7baca7 100755
--- a/scripts/build-mainline-modules.sh
+++ b/scripts/build-mainline-modules.sh
@@ -51,6 +51,13 @@
   "$@"
 }
 
+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 @@
     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