diff options
Diffstat (limited to 'scripts/build-mainline-modules.sh')
| -rwxr-xr-x | scripts/build-mainline-modules.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/build-mainline-modules.sh b/scripts/build-mainline-modules.sh index 1bc78e6ba..c7baca70d 100755 --- a/scripts/build-mainline-modules.sh +++ b/scripts/build-mainline-modules.sh @@ -24,7 +24,6 @@ MODULES_SDK_AND_EXPORTS=( i18n-module-test-exports i18n-module-sdk platform-mainline-sdk - platform-mainline-host-exports ) # List of libraries installed on the platform that are needed for ART chroot @@ -52,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) @@ -69,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 |