Use pinned nodpi PrebuiltGmsCore

* This fixes issues with dpi
* Also, reshuffle PrebuiltGmsCore in blob lists,
  since it has to be pinned now
* Standardize blob list naming to proprietary-files-$arch(/common).txt
* This is slightly older than the newest PrebuiltGmsCore,
  but it almost never has to be updated, and Android will
  silently update to a proper version with the correct dpi

Signed-off-by: Paul Keith <[email protected]>

build/gapps.sh

@@ -58,7 +58,7 @@ function create() {
     test -d $OUT/$GARCH/system/addon.d || mkdir -p $OUT/$GARCH/system/addon.d
     test -f $ADDOND && rm -f $ADDOND
     cat $TOP/addond_head > $ADDOND
-    for txt_file in common-proprietary-files proprietary-files-$GARCH proprietary-files
+    for txt_file in proprietary-files-common proprietary-files-$GARCH
     do
         cat $TOP/$txt_file.txt | while read l
         do

extract-files.sh

@@ -58,12 +58,11 @@ fi
 # Initialize the helper for common gapps
 setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT"
 
-extract "$MY_DIR"/common-proprietary-files.txt "$SRC"
+extract "$MY_DIR"/proprietary-files-common.txt "$SRC"
 
 # Reinitialize the helper for target gapps
 setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT"
 
 extract "$MY_DIR"/proprietary-files-$TARGET.txt "$SRC"
-extract "$MY_DIR"/proprietary-files.txt "$SRC"
 
 "$MY_DIR"/setup-makefiles.sh

proprietary-files-arm.txt

@@ -1 +1,2 @@
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|223c3197054051fce7dcf42db043d72dbbdf7a2a
 lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e

proprietary-files-arm64.txt

@@ -1,2 +1,3 @@
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|18b7869a868228fc0d610aaefc95bec8058f5912
 lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
 lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d

proprietary-files-x86.txt

@@ -1 +1,2 @@
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|b0ea7210611d3af26d4352d389fbe617410bed06
 lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79

proprietary-files.txt

@@ -1 +0,0 @@
--priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED

setup-makefiles.sh

@@ -38,7 +38,7 @@ setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT" true
 write_headers "arm arm64 x86"
 
 # Common gapps
-write_makefiles "$MY_DIR"/common-proprietary-files.txt
+write_makefiles "$MY_DIR"/proprietary-files-common.txt
 
 # We are done with common
 write_footers
@@ -50,7 +50,6 @@ setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT" true
 write_headers "$TARGET"
 
 write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
-write_makefiles "$MY_DIR"/proprietary-files.txt
 
 printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"