commit 7ea19991c69fb45a8a8f77b39297eb80b583656c
author Steve Kondik <steve@cyngn.com> Wed Jul 20 20:03:40 2016 -0700
committer Gerrit Code Review <gerrit@cyanogenmod.org> Wed Jul 20 20:08:54 2016 -0700
tree 2d7400793dca26d0920fd04bd319e3cb1af01322
parent e32f9b827afa3eba39dc62537183786350817c38

cm: Underp dumping of 64-bit only libraries

Change-Id: I9c2140b40747fc7f847f1a532c42fb7ae5bfc3fd

extract_utils.sh

diff --git a/extract_utils.sh b/extract_utils.sh
index a898a78..5164791 100644
--- a/extract_utils.sh
+++ b/extract_utils.sh
@@ -288,15 +288,16 @@
     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 @@
     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"