diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-07-29 00:00:16 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-07-29 04:24:05 -0700 |
| commit | 03ce400352e772634299d074bdbf9c5ffb636869 (patch) | |
| tree | f5c115396a64a58e7b4dc63df30c6dca104c4dfd /build | |
| parent | 630d7ed01fa931d373c4b6142ccce65f675c65c9 (diff) | |
| download | vendor_replicant-03ce400352e772634299d074bdbf9c5ffb636869.zip vendor_replicant-03ce400352e772634299d074bdbf9c5ffb636869.tar.gz vendor_replicant-03ce400352e772634299d074bdbf9c5ffb636869.tar.bz2 | |
Revert "extract_utils: Don't write multilib tags on 32-bit only devices"
* Not gonna work without preparsing all the lists combined together.
This reverts commit b7b7f884437c76d196f94461751093a7efe47d4c.
Change-Id: I63ceead414d7f8416e2c2c8e4b12098077b545e2
Diffstat (limited to 'build')
| -rw-r--r-- | build/tools/extract_utils.sh | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh index 8cd2caf..aaae375 100644 --- a/build/tools/extract_utils.sh +++ b/build/tools/extract_utils.sh @@ -224,7 +224,7 @@ function write_packages() { else printf 'LOCAL_SRC_FILES := %s/lib/%s\n' "$SRC" "$FILE" fi - if [ ! -z "$EXTRA" ]; then + if [ "$EXTRA" != "none" ]; then printf 'LOCAL_MULTILIB := %s\n' "$EXTRA" fi elif [ "$CLASS" = "APPS" ]; then @@ -299,41 +299,27 @@ function write_product_packages() { local LIB32=( $(comm -23 <(printf '%s\n' "${T_LIB32[@]}") <(printf '%s\n' "${MULTILIBS[@]}")) ) local LIB64=( $(comm -23 <(printf '%s\n' "${T_LIB64[@]}") <(printf '%s\n' "${MULTILIBS[@]}")) ) - local T_V_LIB32=( $(prefix_match "vendor/lib/") ) - local T_V_LIB64=( $(prefix_match "vendor/lib64/") ) - local V_MULTILIBS=( $(comm -12 <(printf '%s\n' "${T_V_LIB32[@]}") <(printf '%s\n' "${T_V_LIB64[@]}")) ) - local V_LIB32=( $(comm -23 <(printf '%s\n' "${T_V_LIB32[@]}") <(printf '%s\n' "${V_MULTILIBS[@]}")) ) - local V_LIB64=( $(comm -23 <(printf '%s\n' "${T_V_LIB64[@]}") <(printf '%s\n' "${V_MULTILIBS[@]}")) ) - - local USE_MULTILIB=0 - if [ "${#MULTILIBS[@]}" -gt "0" -o "${#LIB64[@]}" -gt "0" \ - -o "${#V_MULTILIBS[@]}" -gt "0" -o "${#V_LIB64[@]}" -gt "0" ] ; then - USE_MULTILIB=1 - fi - if [ "${#MULTILIBS[@]}" -gt "0" ]; then write_packages "SHARED_LIBRARIES" "false" "both" "MULTILIBS" >> "$ANDROIDMK" fi if [ "${#LIB32[@]}" -gt "0" ]; then - local EXTRA= - if [ "$USE_MULTILIB" -eq "1" ]; then - EXTRA="32" - fi - write_packages "SHARED_LIBRARIES" "false" "$EXTRA" "LIB32" >> "$ANDROIDMK" + write_packages "SHARED_LIBRARIES" "false" "32" "LIB32" >> "$ANDROIDMK" fi if [ "${#LIB64[@]}" -gt "0" ]; then write_packages "SHARED_LIBRARIES" "false" "64" "LIB64" >> "$ANDROIDMK" fi + local T_V_LIB32=( $(prefix_match "vendor/lib/") ) + local T_V_LIB64=( $(prefix_match "vendor/lib64/") ) + local V_MULTILIBS=( $(comm -12 <(printf '%s\n' "${T_V_LIB32[@]}") <(printf '%s\n' "${T_V_LIB64[@]}")) ) + local V_LIB32=( $(comm -23 <(printf '%s\n' "${T_V_LIB32[@]}") <(printf '%s\n' "${V_MULTILIBS[@]}")) ) + local V_LIB64=( $(comm -23 <(printf '%s\n' "${T_V_LIB64[@]}") <(printf '%s\n' "${V_MULTILIBS[@]}")) ) + if [ "${#V_MULTILIBS[@]}" -gt "0" ]; then write_packages "SHARED_LIBRARIES" "true" "both" "V_MULTILIBS" >> "$ANDROIDMK" fi if [ "${#V_LIB32[@]}" -gt "0" ]; then - local EXTRA= - if [ "$USE_MULTILIB" -eq "1" ]; then - EXTRA="32" - fi - write_packages "SHARED_LIBRARIES" "true" "$EXTRA" "V_LIB32" >> "$ANDROIDMK" + write_packages "SHARED_LIBRARIES" "true" "32" "V_LIB32" >> "$ANDROIDMK" fi if [ "${#V_LIB64[@]}" -gt "0" ]; then write_packages "SHARED_LIBRARIES" "true" "64" "V_LIB64" >> "$ANDROIDMK" |