summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-07-20 20:03:40 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-07-20 20:08:54 -0700
commit60ef86de1a0728a66e0a4147fc3ca69ec58805ce (patch)
tree190954ea388c9883ac046847287b83c4ac27016d /build
parent374d138367f8f7bb45ca2ba696f7bff65cd8a345 (diff)
downloadvendor_replicant-60ef86de1a0728a66e0a4147fc3ca69ec58805ce.zip
vendor_replicant-60ef86de1a0728a66e0a4147fc3ca69ec58805ce.tar.gz
vendor_replicant-60ef86de1a0728a66e0a4147fc3ca69ec58805ce.tar.bz2
cm: Underp dumping of 64-bit only libraries
Change-Id: I9c2140b40747fc7f847f1a532c42fb7ae5bfc3fd
Diffstat (limited to 'build')
-rw-r--r--build/tools/extract_utils.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index a898a78..5164791 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -288,15 +288,16 @@ function write_product_packages() {
local T_LIB64=( $(prefix_match "lib64/") )
local MULTILIBS=( $(comm -12 <(printf '%s\n' "${T_LIB32[@]}") <(printf '%s\n' "${T_LIB64[@]}")) )
local LIB32=( $(comm -23 <(printf '%s\n' "${T_LIB32[@]}") <(printf '%s\n' "${MULTILIBS[@]}")) )
- local LIB64=( $(comm -13 <(printf '%s\n' "${T_LIB64[@]}") <(printf '%s\n' "${MULTILIBS[@]}")) )
+ local LIB64=( $(comm -23 <(printf '%s\n' "${T_LIB64[@]}") <(printf '%s\n' "${MULTILIBS[@]}")) )
+ echo "lib64: ${LIB64[@]}"
if [ "${#MULTILIBS[@]}" -gt "0" ]; then
write_packages "SHARED_LIBRARIES" "false" "false" "both" "MULTILIBS" >> "$ANDROIDMK"
fi
if [ "${#LIB32[@]}" -gt "0" ]; then
write_packages "SHARED_LIBRARIES" "false" "false" "32" "LIB32" >> "$ANDROIDMK"
fi
- if [ ! "${#LIB64[@]}" -gt "0" ]; then
+ if [ "${#LIB64[@]}" -gt "0" ]; then
write_packages "SHARED_LIBRARIES" "false" "false" "64" "LIB64" >> "$ANDROIDMK"
fi
@@ -304,7 +305,7 @@ function write_product_packages() {
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 -13 <(printf '%s\n' "${T_V_LIB64[@]}") <(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" "false" "both" "V_MULTILIBS" >> "$ANDROIDMK"