diff --git a/.gitattributes b/.gitattributes index 68b8853..82437a5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,35 @@ arm64/proprietary/product/priv-app/Velvet/Velvet.apk filter=lfs diff=lfs merge=l arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk filter=lfs diff=lfs merge=lfs -text arm/proprietary/product/priv-app/Velvet/Velvet.apk filter=lfs diff=lfs merge=lfs -text arm64/proprietary/product/priv-app/GmsCore/GmsCore.apk filter=lfs diff=lfs merge=lfs -text +*.gitignore filter=lfs diff=lfs merge=lfs -text +*.yml filter=lfs diff=lfs merge=lfs -text +/LICENSE filter=lfs diff=lfs merge=lfs -text +/Makefile filter=lfs diff=lfs merge=lfs -text +*.md filter=lfs diff=lfs merge=lfs -text +/addond_head filter=lfs diff=lfs merge=lfs -text +/addond_tail filter=lfs diff=lfs merge=lfs -text +*.bp filter=lfs diff=lfs merge=lfs -text +*.mk filter=lfs diff=lfs merge=lfs -text +*.apk filter=lfs diff=lfs merge=lfs -text +*.so filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.sh filter=lfs diff=lfs merge=lfs -text +*.RSA filter=lfs diff=lfs merge=lfs -text +*.SF filter=lfs diff=lfs merge=lfs -text +*.MF filter=lfs diff=lfs merge=lfs -text +/build/meta/com/android/otacert filter=lfs diff=lfs merge=lfs -text +/build/meta/com/google/android/update-binary filter=lfs diff=lfs merge=lfs -text +/build/meta/com/google/android/updater-script filter=lfs diff=lfs merge=lfs -text +*.dylib filter=lfs diff=lfs merge=lfs -text +*.pk8 filter=lfs diff=lfs merge=lfs -text +*.pem filter=lfs diff=lfs merge=lfs -text +/cicd/Dockerfile filter=lfs diff=lfs merge=lfs -text +*.py filter=lfs diff=lfs merge=lfs -text +*.xml filter=lfs diff=lfs merge=lfs -text +*.rc filter=lfs diff=lfs merge=lfs -text +*.der filter=lfs diff=lfs merge=lfs -text +*.txt filter=lfs diff=lfs merge=lfs -text +/toybox-arm filter=lfs diff=lfs merge=lfs -text +/toybox-arm64 filter=lfs diff=lfs merge=lfs -text +/toybox-x86 filter=lfs diff=lfs merge=lfs -text +/toybox-x86_64 filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index be7fb59..3194cd2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ -# out directory -out/ - -# rro build artifacts -overlay/**/build/ - -# gapps log -gapps_log +version https://git-lfs.github.com/spec/v1 +oid sha256:2aa4a45f10a2df69cf1ed1698d6629ae28c569c3ca3457ce4c6ed3ce91c10eab +size 85 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c84c627..3c9c206 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,3 @@ -image: registry.gitlab.com/mindthegapps/vendor_gapps:latest - -verify: - script: - - ./cicd/verify-permissions.py +version https://git-lfs.github.com/spec/v1 +oid sha256:630d6a8c7e4cef504ddfef93bb20ea812ae54820d96a519bb953d5b61e47e4bd +size 114 diff --git a/LICENSE b/LICENSE index 3820978..671ec43 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,3 @@ -For files in [arm/arm64/common/x86/x86_64]/proprietary: - These are closed source/propietary/prebuilt files. - I do not own them, these are just here to make - your life easier when compiling the package. - Contacts their authors for information about licensing. - -For any other file: - GNU License v2, unless otherwise noted - (https://www.gnu.org/licenses/gpl-2.0.html for more information) +version https://git-lfs.github.com/spec/v1 +oid sha256:7dd210e662049585d2526d4d5a063507bad7e4874b72ebd6daa448af2c7dddcc +size 404 diff --git a/Makefile b/Makefile index 1643e68..4623e3c 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,3 @@ -### DO NOT EDIT THIS FILE ### -include build/main.mk -### DO NOT EDIT THIS FILE ### +version https://git-lfs.github.com/spec/v1 +oid sha256:599ee37c5f531a7ddc9a9385ae34f5f8db8648b6a9770d86751c7696a7210f15 +size 82 diff --git a/README.md b/README.md index 3600ecb..4cdb57e 100644 --- a/README.md +++ b/README.md @@ -1,92 +1,3 @@ -# vendor_gapps - -**GApps for android devices** - -Build standalone zips -------------------- - -You can compile your GApps package with GNU make - -_make distclean_ -- Remove output directory - -_make gapps_arm_ -- compile signed flashable GApps for arm - -_make gapps_arm64_ -- compile signed flashable GApps for arm64 - -_make gapps_x86_64_ -- compile signed flashable GApps for x86_64 - -Build inline with Android -------------------- -1. Sync this repo to `$GAPPS_PATH` where `$GAPPS_PATH` is the path to this repo -2. Include `$GAPPS_PATH/$ARCH/$ARCH-vendor.mk` where `$ARCH` is arm, arm64, or x86_64 depending on the device's architecture - -Explanation of pinned blobs -------------------- -NOTE: All arch specific blobs not specifically explained here are pinned for the sake of being able to extract independently of the architecture of the source device. - -AndroidMigratePrebuilt.apk -- This is from a marlin factory image to avoid crashes with the one found in the walleye factory images. - -GoogleCalendarSyncAdapter.apk -- This is no longer included in Google system images and is required for syncing Google Calendar accounts with AOSP Calendar. - -PrebuiltExchange3Google.apk -- This is no longer included in Google system images and is required for using Exchange accounts in the Gmail app. - -PrebuiltGmsCore.apk -- This is a nodpi apk so that it works properly on all devices and updates to the appropriate one. This is generally from APKMirror and is not usually updated between major version updates. - -SetupWizard.apk -- This is a non-pixel SetupWizard for better UX and less pixel-specific references. - -default-permissions.xml and privapp-permissions-google.xml -- These do not always contain all the necessary permissions for apks which are not from the corresponding factory image, so they must be modified to avoid permission related crashes. - -libjni_latinimegoogle.so -- This lib is no longer included in Google system images and is required for swype typing with AOSP LatinIME. - -Thanks and Credits -------------------- - -aleasto -- Install scripts for 11 with dedicated partitions support - -cdesai -- Reminding me that /proc/meminfo is a thing - -ciwrl -- Catching a few spelling errors in this file - -gmrt -- Initial list for gapps - -flex1911, raymanfx, deadman96385, jrior001, haggertk, arco -- Thorough testing - -harryyoud -- Thorough testing and Jenkins setup - -haggertk -- Suggesting CI integration of privapp-permissions - -jrizzoli -- Initial build scripts and build system - -luca020400 -- Fixing my makefiles - -LuK1337 -- Setting up custom Docker image for CI, improving scripts, thorough testing - -mikeioannina -- The name for MindTheGapps - -aleasto, razorloves, raymanfx -- Helping maintain this repo - -syphyr -- Showing me how to repack libs in PrebuiltGmsCore +version https://git-lfs.github.com/spec/v1 +oid sha256:8811f07839add5e55e910e513d82eed464f10e4077382a2bf620972c0964e839 +size 2728 diff --git a/TODO.md b/TODO.md index d5b6c24..2a43ecc 100644 --- a/TODO.md +++ b/TODO.md @@ -1,4 +1,3 @@ -# TODO list - -- Look at adding prebuilt voice recognition for Velvet -- Update sigma gapps from a proper device release +version https://git-lfs.github.com/spec/v1 +oid sha256:c44cdbcf0fcc2d2ae384830f37d14a4c4f2b4fa1dc0a0b803256eb832fbf7ae2 +size 118 diff --git a/addond_head b/addond_head index f764836..eef160e 100644 --- a/addond_head +++ b/addond_head @@ -1,10 +1,3 @@ -#!/sbin/sh -# -# ADDOND_VERSION=3 -# -# /system/addon.d/30-gapps.sh -# -. /tmp/backuptool.functions - -list_files() { -cat < $GLOG - echo "ARCH= $GARCH" >> $GLOG - echo "OS= $(uname -s -r)" >> $GLOG - echo "NAME= $(whoami) at $(uname -n)" >> $GLOG - PREBUILT=$GAPPS_TOP/$GARCH/proprietary - test -d $OUT || mkdir $OUT; - test -d $OUT/$GARCH || mkdir -p $OUT/$GARCH - test -d $OUT/$GARCH/system || mkdir -p $OUT/$GARCH/system - echo "Build directories are now ready" >> $GLOG - echo "Compiling RROs" - $GAPPS_TOP/overlay/build_overlays.sh $GARCH $OUT/$GARCH - echo "Getting prebuilts..." - echo "Copying stuff" >> $GLOG - cp $GAPPS_TOP/toybox-$GARCH $OUT/$GARCH/toybox >> $GLOG - cp -r $PREBUILT/* $OUT/$GARCH/system >> $GLOG - cp -r $COMMON/* $OUT/$GARCH/system >> $GLOG - echo "Generating addon.d script" >> $GLOG - test -d $OUT/$GARCH/system/addon.d || mkdir -p $OUT/$GARCH/system/addon.d - cp -f addond_head $OUT/$GARCH/system/addon.d - cp -f addond_tail $OUT/$GARCH/system/addon.d - echo "Writing build props..." - echo "arch=$CPUARCH" > $OUT/$GARCH/build.prop - echo "version=$SDKV" >> $OUT/$GARCH/build.prop - echo "version_nice=$ANDROIDV" >> $OUT/$GARCH/build.prop -} - -function zipit() { - BUILDZIP=MindTheGapps-$ANDROIDV-$GARCH-$DATE.zip - echo "Importing installation scripts..." - test -d $OUT/$GARCH/META-INF || mkdir $OUT/$GARCH/META-INF; - cp -r $METAINF/* $OUT/$GARCH/META-INF/ && echo "Meta copied" >> $GLOG - echo "Creating package..." - cd $OUT/$GARCH - zip -r /tmp/$BUILDZIP . >> $GLOG - rm -rf $OUT/tmp >> $GLOG - cd $GAPPS_TOP - if [ -f /tmp/$BUILDZIP ]; then - echo "Signing zip..." - java -Xmx2048m -jar $SIGNAPK -w $ZIP_KEY_PEM $ZIP_KEY_PK8 /tmp/$BUILDZIP $OUT/$BUILDZIP >> $GLOG - else - echo "Couldn't zip files!" - echo "Couldn't find unsigned zip file, aborting" >> $GLOG - return 1 - fi -} - -function getsha256() { - if [ -x $(which sha256sum) ]; then - echo "sha256sum is installed, getting sha256..." >> $GLOG - echo "Getting sha256sum..." - GSHA256=$(sha256sum $OUT/$BUILDZIP) - echo -e "$GSHA256" > $OUT/$BUILDZIP.sha256sum - echo "sha256 exported at $OUT/$BUILDZIP.sha256sum" - return 0 - else - echo "sha256sum is not installed, aborting" >> $GLOG - return 1 - fi -} - -## -# main -# -if [ -x $(which realpath) ]; then - echo "Realpath found!" >> $GLOG -else - GAPPS_TOP=$(cd . && pwd) # some darwin love - echo "No realpath found!" >> $GLOG -fi - -for func in create zipit getsha256 clean; do - $func - ret=$? - if [ "$ret" == 0 ]; then - continue - else - failed - fi -done - -echo "Done!" >> $GLOG -echo "Build completed: $GSHA256" -exit 0 +version https://git-lfs.github.com/spec/v1 +oid sha256:bc9738e6695745bb011d149f4cf5cde1354a8906e388c0233c3cad88fb88d6d2 +size 3509 diff --git a/build/main.mk b/build/main.mk index b86483e..8fa932b 100644 --- a/build/main.mk +++ b/build/main.mk @@ -1,22 +1,3 @@ -# build paths -TOPDIR := . -BUILD_SYSTEM := $(TOPDIR)/build -BUILD_GAPPS := $(BUILD_SYSTEM)/gapps.sh -OUTDIR := $(TOPDIR)/out -LOG_BUILD := /tmp/gapps_log - -distclean: - @rm -fr $(OUTDIR) - @echo "Output removed! Ready for a clean build" - -gapps_arm: - @echo "Compiling GApps for arm..." - @bash $(BUILD_GAPPS) arm 2>&1 - -gapps_arm64: - @echo "Compiling GApps for arm64..." - @bash $(BUILD_GAPPS) arm64 2>&1 - -gapps_x86_64: - @echo "Compiling GApps for x86_64..." - @bash $(BUILD_GAPPS) x86_64 2>&1 +version https://git-lfs.github.com/spec/v1 +oid sha256:fdf254ebb48bb279683bc0dd61c0bda847e7ea86c6bb22bde931f71a1784228d +size 482 diff --git a/build/meta/CERT.RSA b/build/meta/CERT.RSA index d7ce8f5..38a0b6a 100644 Binary files a/build/meta/CERT.RSA and b/build/meta/CERT.RSA differ diff --git a/build/meta/CERT.SF b/build/meta/CERT.SF index bd86db4..800d57a 100644 --- a/build/meta/CERT.SF +++ b/build/meta/CERT.SF @@ -1,2 +1,3 @@ -Signature-Version: 1.0 -Created-By: 1.0 (Android SignApk) +version https://git-lfs.github.com/spec/v1 +oid sha256:4311b364d9db14a7478969ceded03f8a9bf2b136f34f80935fa4bbf244add1e7 +size 59 diff --git a/build/meta/MANIFEST.MF b/build/meta/MANIFEST.MF index d9c9188..cdefc9d 100644 --- a/build/meta/MANIFEST.MF +++ b/build/meta/MANIFEST.MF @@ -1,2 +1,3 @@ -Manifest-Version: 1.0 -Created-By: 1.0 (Android SignApk) +version https://git-lfs.github.com/spec/v1 +oid sha256:a4693b799fca2439111aad443f3bb3c062a1316226c02852ee4c02224d254c65 +size 58 diff --git a/build/meta/com/android/otacert b/build/meta/com/android/otacert index e242d83..5836b6a 100644 --- a/build/meta/com/android/otacert +++ b/build/meta/com/android/otacert @@ -1,27 +1,3 @@ ------BEGIN CERTIFICATE----- -MIIEqDCCA5CgAwIBAgIJAJNurL4H8gHfMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD -VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g -VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE -AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe -Fw0wODAyMjkwMTMzNDZaFw0zNTA3MTcwMTMzNDZaMIGUMQswCQYDVQQGEwJVUzET -MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G -A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p -ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI -hvcNAQEBBQADggENADCCAQgCggEBANaTGQTexgskse3HYuDZ2CU+Ps1s6x3i/waM -qOi8qM1r03hupwqnbOYOuw+ZNVn/2T53qUPn6D1LZLjk/qLT5lbx4meoG7+yMLV4 -wgRDvkxyGLhG9SEVhvA4oU6Jwr44f46+z4/Kw9oe4zDJ6pPQp8PcSvNQIg1QCAcy -4ICXF+5qBTNZ5qaU7Cyz8oSgpGbIepTYOzEJOmc3Li9kEsBubULxWBjf/gOBzAzU -RNps3cO4JFgZSAGzJWQTT7/emMkod0jb9WdqVA2BVMi7yge54kdVMxHEa5r3b97s -zI5p58ii0I54JiCUP5lyfTwE/nKZHZnfm644oLIXf6MdW2r+6R8CAQOjgfwwgfkw -HQYDVR0OBBYEFEhZAFY9JyxGrhGGBaR0GawJyowRMIHJBgNVHSMEgcEwgb6AFEhZ -AFY9JyxGrhGGBaR0GawJyowRoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE -CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH -QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG -CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJAJNurL4H8gHfMAwGA1Ud -EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHqvlozrUMRBBVEY0NqrrwFbinZa -J6cVosK0TyIUFf/azgMJWr+kLfcHCHJsIGnlw27drgQAvilFLAhLwn62oX6snb4Y -LCBOsVMR9FXYJLZW2+TcIkCRLXWG/oiVHQGo/rWuWkJgU134NDEFJCJGjDbiLCpe -+ZTWHdcwauTJ9pUbo8EvHRkU3cYfGmLaLfgn9gP+pWA7LFQNvXwBnDa6sppCccEX -31I828XzgXpJ4O+mDL1/dBd+ek8ZPUP0IgdyZm5MTYPhvVqGCHzzTy3sIeJFymwr -sBbmg2OAUNLEMO6nwmocSdN2ClirfxqCzJOLSDE4QyS9BAH6EhY6UFcOaE0= ------END CERTIFICATE----- +version https://git-lfs.github.com/spec/v1 +oid sha256:a4384ba815b9499a5ce349b4e33c1755278873fe2eac150a068823f526e6dbde +size 1675 diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary index b0f0dd3..e9efa2e 100644 --- a/build/meta/com/google/android/update-binary +++ b/build/meta/com/google/android/update-binary @@ -1,322 +1,3 @@ -#!/sbin/sh - -OUTFD="/proc/self/fd/$2" -ZIP=$3 - -set_con() { - chcon -h u:object_r:"$1":s0 $2 - chcon u:object_r:"$1":s0 $2 -} - -set_perm() { - chmod $1 $2 -} - -set_owner() { - chown $1:$2 $3 -} - -ui_print() { - echo "ui_print $1" > "$OUTFD"; - echo "ui_print" > "$OUTFD"; -} - -getprop2() { - grep -m 1 "^$2=" $1 | cut -d= -f2 -} - -cleanup() { - ui_print "Cleaning up files" - rm -rf $TMP/system - rm -rf $TMP/bin - rm $TMP/toybox - - ui_print "Unmounting partitions" - umount -l "$SYSTEM_MNT" - umount -l /product || true - umount -l /system_ext || true -} - -error() { - ui_print "$1" - cleanup - exit 1 -} - -error_no_space() { - error "Not enough space for GApps! Aborting" -} - -error_mounting() { - error "Could not mount $1! Aborting" -} - -get_block_for_mount_point() { - grep -v "^#" /etc/recovery.fstab | grep "[[:blank:]]$1[[:blank:]]" | tail -n1 | tr -s [:blank:] ' ' | cut -d' ' -f1 -} - -find_block() { - local name="$1" - local fstab_entry=$(get_block_for_mount_point "/$name") - # P-SAR hacks - [ -z "$fstab_entry" ] && [ "$name" = "system" ] && fstab_entry=$(get_block_for_mount_point "/") - [ -z "$fstab_entry" ] && [ "$name" = "system" ] && fstab_entry=$(get_block_for_mount_point "/system_root") - - local dev - if [ "$DYNAMIC_PARTITIONS" = "true" ]; then - if [ -n "$fstab_entry" ]; then - dev="${BLK_PATH}/${fstab_entry}${SLOT_SUFFIX}" - else - dev="${BLK_PATH}/${name}${SLOT_SUFFIX}" - fi - else - if [ -n "$fstab_entry" ]; then - dev="${fstab_entry}${SLOT_SUFFIX}" - else - dev="${BLK_PATH}/${name}${SLOT_SUFFIX}" - fi - fi - - if [ -b "$dev" ]; then - echo "$dev" - fi -} - -compute_apps_size() { - NEEDED_STORAGE_SYSTEM=$(expr $(du -cs `find -maxdepth 1 -mindepth 1 ! -name product ! -name system_ext` | tail -n1 | cut -f1) + $STORAGE_BUFFER) - NEEDED_STORAGE_PRODUCT=$(expr $(du -s ./product | cut -f1) + $STORAGE_BUFFER) - NEEDED_STORAGE_SYSTEM_EXT=$(expr $(du -s ./system_ext | cut -f1) + $STORAGE_BUFFER) - - RECLAIMABLE_STORAGE_SYSTEM=$(find . ! -path "./product/*" ! -path "./system_ext/*" -type f | sed "s|^./|$SYSTEM_OUT/|" | xargs ls -d 2>/dev/null | xargs du -cs PLACEHOLDER 2>/dev/null | tail -n1 | cut -f1) - NEEDED_STORAGE_SYSTEM=$(expr $NEEDED_STORAGE_SYSTEM - $RECLAIMABLE_STORAGE_SYSTEM) - - RECLAIMABLE_STORAGE_PRODUCT=$(find ./product -type f | sed "s|^./|$SYSTEM_OUT/|" | xargs ls -d 2>/dev/null | xargs du -cs PLACEHOLDER 2>/dev/null | tail -n1 | cut -f1) - NEEDED_STORAGE_PRODUCT=$(expr $NEEDED_STORAGE_PRODUCT - $RECLAIMABLE_STORAGE_PRODUCT) - - RECLAIMABLE_STORAGE_SYSTEM_EXT=$(find ./system_ext -type f | sed "s|^./|$SYSTEM_OUT/|" | xargs ls -d 2>/dev/null | xargs du -cs PLACEHOLDER 2>/dev/null | tail -n1 | cut -f1) - NEEDED_STORAGE_SYSTEM_EXT=$(expr $NEEDED_STORAGE_SYSTEM_EXT - $RECLAIMABLE_STORAGE_SYSTEM_EXT) - - if [ -z "$PRODUCT_BLOCK" ]; then - NEEDED_STORAGE_SYSTEM=$(expr $NEEDED_STORAGE_SYSTEM + $NEEDED_STORAGE_PRODUCT - $STORAGE_BUFFER) - fi - if [ -z "$SYSTEM_EXT_BLOCK" ]; then - NEEDED_STORAGE_SYSTEM=$(expr $NEEDED_STORAGE_SYSTEM + $NEEDED_STORAGE_SYSTEM_EXT - $STORAGE_BUFFER) - fi -} - -remove_big_optional_apps() { - ui_print "Low resource device detected, removing large extras" - rm -rf product/app/GoogleTTS - rm -rf product/app/MarkupGoogle_v2 - rm -rf product/app/SpeechServicesByGoogle - rm -rf product/app/talkback - rm -rf product/priv-app/GoogleRestore - rm -rf product/priv-app/Velvet - rm -rf product/priv-app/VelvetTitan - rm -rf product/priv-app/Wellbeing - rm -rf system_ext/priv-app/SetupWizard -} - -ui_print "**********************" -ui_print "MindTheGapps installer" -ui_print "**********************" - -ui_print "Extracting files" -TMP=/tmp -cd "$TMP" -unzip -o "$ZIP" -rm -rf META-INF - -# Check for arch. We need to do this before extracting our toybox, since that might be -# compiled for a different architecture. Just hope that all environments have at least -# a proper `grep` and `uname`. -GAPPS_ARCH=$(getprop2 $TMP/build.prop arch) -CPU_ARCH=$(getprop ro.bionic.arch) -if [ $GAPPS_ARCH != $CPU_ARCH ]; then - error "This package is built for $GAPPS_ARCH but your device is $CPU_ARCH! Aborting" -fi - -ui_print "Setting up environment" -TOYBOX="${TMP}/toybox" -chmod +x "$TOYBOX" - -TOYS_PATH="${TMP}/bin" -rm -rf "$TOYS_PATH"; -$TOYBOX install -d "$TOYS_PATH" -for toy in $($TOYBOX); do - $TOYBOX ln -sf "$TOYBOX" "${TOYS_PATH}/${toy}" -done -PATH="${TOYS_PATH}:${PATH}" - -ui_print "Mounting partitions" - -# Ensure system is unmounted so mounting succeeds -umount /system || umount /mnt/system || true -umount /product || true -umount /system_ext || true - -# Find partitions -DYNAMIC_PARTITIONS=`getprop ro.boot.dynamic_partitions` -if [ "$DYNAMIC_PARTITIONS" = "true" ]; then - BLK_PATH="/dev/block/mapper" -else - BLK_PATH=/dev/block/bootdevice/by-name -fi - -CURRENTSLOT=`getprop ro.boot.slot_suffix` -if [ ! -z "$CURRENTSLOT" ]; then - if [ "$CURRENTSLOT" == "_a" ]; then - SLOT_SUFFIX="_a" - else - SLOT_SUFFIX="_b" - fi -fi - -SYSTEM_BLOCK=$(find_block "system") -PRODUCT_BLOCK=$(find_block "product") -SYSTEM_EXT_BLOCK=$(find_block "system_ext") - -# Disable rw protection on dynamic partitions -if [ "$DYNAMIC_PARTITIONS" = "true" ]; then - blockdev --setrw "$SYSTEM_BLOCK" - if [ -n "$PRODUCT_BLOCK" ]; then - blockdev --setrw "$PRODUCT_BLOCK" - fi - if [ -n "$SYSTEM_EXT_BLOCK" ]; then - blockdev --setrw "$SYSTEM_EXT_BLOCK" - fi -fi - -# Mount and define SYSTEM_OUT -SYSTEM_MNT=/mnt/system -mkdir -p "$SYSTEM_MNT" || true -if mount -o rw "$SYSTEM_BLOCK" "$SYSTEM_MNT"; then -ui_print "$SYSTEM_MNT mounted" -else -error_mounting "$SYSTEM_MNT" -fi -SYSTEM_OUT="${SYSTEM_MNT}/system" - -# Compare sdk version -GAPPS_VERSION=$(getprop2 $TMP/build.prop version) -ANDROID_VERSION=$(getprop2 $SYSTEM_OUT/build.prop ro.build.version.sdk) -if [ "$GAPPS_VERSION" != "$ANDROID_VERSION" ]; then - gapps_version_nice=$(getprop2 $TMP/build.prop version_nice) - android_version_nice=$(getprop2 $SYSTEM_OUT/build.prop ro.build.version.release) - error "This package is for Android $gapps_version_nice (SDK $GAPPS_VERSION) but your system is Android $android_version_nice (SDK $ANDROID_VERSION)! Aborting" -fi - -# Ignore {product,system_ext} block devices in case they are symlinks -# This is common on devices where maintainers have chosen not to use -# real partitions because of their size being too small to be useful -if [ -L "${SYSTEM_MNT}/product" ]; then -PRODUCT_BLOCK="" -fi -if [ -L "${SYSTEM_MNT}/system_ext" ]; then -SYSTEM_EXT_BLOCK="" -fi - -if [ -n "$PRODUCT_BLOCK" ]; then - mkdir /product || true - if mount -o rw "$PRODUCT_BLOCK" /product; then - ui_print "/product mounted" - else - error_mounting "/product" - fi -fi -if [ -n "$SYSTEM_EXT_BLOCK" ]; then - mkdir /system_ext || true - if mount -o rw "$SYSTEM_EXT_BLOCK" /system_ext; then - ui_print "/system_ext mounted" - else - error_mounting "/system_ext" - fi -fi - -# Compute storage requirements -SYSTEM_STORAGE=`df $SYSTEM_MNT | tail -1 | tr -s ' ' | cut -d ' ' -f4` -if [ -n "$PRODUCT_BLOCK" ]; then - PRODUCT_STORAGE=`df /product | tail -1 | tr -s ' ' | cut -d ' ' -f4` -fi -if [ -n "$SYSTEM_EXT_BLOCK" ]; then - SYSTEM_EXT_STORAGE=`df /system_ext | tail -1 | tr -s ' ' | cut -d ' ' -f4` -fi -STORAGE_BUFFER=10240 - -cd system - -# Detect tangorpro -DEVICE=$(getprop ro.build.product) -if [ "$DEVICE" == "tangorpro" ]; then - ui_print "Detected tangorpro device. Deleting normal Velvet app" - rm -rf product/priv-app/Velvet -else - rm -rf product/priv-app/VelvetTitan -fi - -compute_apps_size - -if [ "$SYSTEM_STORAGE" -lt "$NEEDED_STORAGE_SYSTEM" ]; then - remove_big_optional_apps - compute_apps_size - if [ "$SYSTEM_STORAGE" -lt "$NEEDED_STORAGE_SYSTEM" ]; then - error_no_space - fi -fi -if [ -n "$PRODUCT_BLOCK" ] && [ "$PRODUCT_STORAGE" -lt "$NEEDED_STORAGE_PRODUCT" ]; then - remove_big_optional_apps - compute_apps_size - if [ "$PRODUCT_STORAGE" -lt "$NEEDED_STORAGE_PRODUCT" ]; then - error_no_space - fi -fi -if [ -n "$SYSTEM_EXT_BLOCK" ] && [ "$SYSTEM_EXT_STORAGE" -lt "$NEEDED_STORAGE_SYSTEM_EXT" ]; then - remove_big_optional_apps - compute_apps_size - if [ "$SYSTEM_EXT_STORAGE" -lt "$NEEDED_STORAGE_SYSTEM_EXT" ]; then - error_no_space - fi -fi - -ui_print "Generating addon.d file" -cat addon.d/addond_head > addon.d/30-gapps.sh -for f in `find . ! -path "./addon.d/*" -type f`; do - line=$(echo "$f" | sed 's/\.\///') - echo "$line" >> addon.d/30-gapps.sh -done -cat addon.d/addond_tail >> addon.d/30-gapps.sh -rm addon.d/addond_head addon.d/addond_tail - -ui_print "Preparing files for copying" -for d in `find . -mindepth 1 -type d -type d`; do - set_perm 0755 $d - set_owner root root $d -done -for f in `find . -type f`; do - type=$(echo "$f" | sed 's/.*\.//') - if [ "$type" == "sh" ] || [ "$type" == "$f" ]; then - set_perm 0755 $f - else - set_perm 0644 $f - fi - set_owner root root $f - set_con system_file $f -done - -ui_print "Copying files" -cp --preserve=a -r ./* "${SYSTEM_OUT}/" -if [ -n "$PRODUCT_BLOCK" ]; then - cp --preserve=a -r ./product/* /product -fi -if [ -n "$SYSTEM_EXT_BLOCK" ]; then - cp --preserve=a -r ./system_ext/* /system_ext -fi - -if [ -e system_ext/priv-app/SetupWizard ] ; then - rm -rf "${SYSTEM_OUT}/system_ext/priv-app/Provision" -fi - -cleanup - -ui_print "Done!" -exit 0 +version https://git-lfs.github.com/spec/v1 +oid sha256:942cb36151928e44fb31aee50563cf728ad8191d41e9a550be0c27ce8005bdb5 +size 9093 diff --git a/build/meta/com/google/android/updater-script b/build/meta/com/google/android/updater-script index 028ff5c..1216e33 100644 --- a/build/meta/com/google/android/updater-script +++ b/build/meta/com/google/android/updater-script @@ -1 +1,3 @@ -# this is a dummy file, the magic is in update-binary, which is a shell script +version https://git-lfs.github.com/spec/v1 +oid sha256:07d861287f6064d46fa550bd3e0c2587d67732a3de233c66e89dddb3949f1524 +size 79 diff --git a/build/sign/apksigner.jar b/build/sign/apksigner.jar index 8a8aca6..39b53d0 100644 Binary files a/build/sign/apksigner.jar and b/build/sign/apksigner.jar differ diff --git a/build/sign/libconscrypt_openjdk_jni.dylib b/build/sign/libconscrypt_openjdk_jni.dylib index caa7126..9971e90 100644 Binary files a/build/sign/libconscrypt_openjdk_jni.dylib and b/build/sign/libconscrypt_openjdk_jni.dylib differ diff --git a/build/sign/libconscrypt_openjdk_jni.so b/build/sign/libconscrypt_openjdk_jni.so index 94b2453..babd9f2 100644 Binary files a/build/sign/libconscrypt_openjdk_jni.so and b/build/sign/libconscrypt_openjdk_jni.so differ diff --git a/build/sign/signapk.jar b/build/sign/signapk.jar index fca21ad..2d7728f 100644 Binary files a/build/sign/signapk.jar and b/build/sign/signapk.jar differ diff --git a/build/sign/testkey.pk8 b/build/sign/testkey.pk8 index 586c1bd..916e540 100644 Binary files a/build/sign/testkey.pk8 and b/build/sign/testkey.pk8 differ diff --git a/build/sign/testkey.x509.pem b/build/sign/testkey.x509.pem index e242d83..5836b6a 100644 --- a/build/sign/testkey.x509.pem +++ b/build/sign/testkey.x509.pem @@ -1,27 +1,3 @@ ------BEGIN CERTIFICATE----- -MIIEqDCCA5CgAwIBAgIJAJNurL4H8gHfMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD -VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4g -VmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UE -AxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe -Fw0wODAyMjkwMTMzNDZaFw0zNTA3MTcwMTMzNDZaMIGUMQswCQYDVQQGEwJVUzET -MBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4G -A1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9p -ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZI -hvcNAQEBBQADggENADCCAQgCggEBANaTGQTexgskse3HYuDZ2CU+Ps1s6x3i/waM -qOi8qM1r03hupwqnbOYOuw+ZNVn/2T53qUPn6D1LZLjk/qLT5lbx4meoG7+yMLV4 -wgRDvkxyGLhG9SEVhvA4oU6Jwr44f46+z4/Kw9oe4zDJ6pPQp8PcSvNQIg1QCAcy -4ICXF+5qBTNZ5qaU7Cyz8oSgpGbIepTYOzEJOmc3Li9kEsBubULxWBjf/gOBzAzU -RNps3cO4JFgZSAGzJWQTT7/emMkod0jb9WdqVA2BVMi7yge54kdVMxHEa5r3b97s -zI5p58ii0I54JiCUP5lyfTwE/nKZHZnfm644oLIXf6MdW2r+6R8CAQOjgfwwgfkw -HQYDVR0OBBYEFEhZAFY9JyxGrhGGBaR0GawJyowRMIHJBgNVHSMEgcEwgb6AFEhZ -AFY9JyxGrhGGBaR0GawJyowRoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UE -CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMH -QW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAG -CSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJAJNurL4H8gHfMAwGA1Ud -EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHqvlozrUMRBBVEY0NqrrwFbinZa -J6cVosK0TyIUFf/azgMJWr+kLfcHCHJsIGnlw27drgQAvilFLAhLwn62oX6snb4Y -LCBOsVMR9FXYJLZW2+TcIkCRLXWG/oiVHQGo/rWuWkJgU134NDEFJCJGjDbiLCpe -+ZTWHdcwauTJ9pUbo8EvHRkU3cYfGmLaLfgn9gP+pWA7LFQNvXwBnDa6sppCccEX -31I828XzgXpJ4O+mDL1/dBd+ek8ZPUP0IgdyZm5MTYPhvVqGCHzzTy3sIeJFymwr -sBbmg2OAUNLEMO6nwmocSdN2ClirfxqCzJOLSDE4QyS9BAH6EhY6UFcOaE0= ------END CERTIFICATE----- +version https://git-lfs.github.com/spec/v1 +oid sha256:a4384ba815b9499a5ce349b4e33c1755278873fe2eac150a068823f526e6dbde +size 1675 diff --git a/cicd/Dockerfile b/cicd/Dockerfile index 7156378..a5c3863 100644 --- a/cicd/Dockerfile +++ b/cicd/Dockerfile @@ -1,5 +1,3 @@ -FROM ubuntu:latest -MAINTAINER LuK1337 - -RUN apt update -RUN apt -y install aapt python3 python3-parse python3-requests +version https://git-lfs.github.com/spec/v1 +oid sha256:f4ebce3eda4df4024e61bf5e03d93f5a03064efd7cc8d809ed4350c5898db59b +size 138 diff --git a/cicd/verify-permissions.py b/cicd/verify-permissions.py index 574310c..1619a94 100755 --- a/cicd/verify-permissions.py +++ b/cicd/verify-permissions.py @@ -1,149 +1,3 @@ -#!/usr/bin/python3 -# -# Copyright (C) 2021 Paul Keith -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 and -# only version 2 as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -import errno -from glob import glob -import os -import subprocess -import sys -from xml.etree import ElementTree - -# Get external packages -try: - from parse import parse -except ImportError: - print('Please install the "parse" package via pip3.') - exit(errno.ENOPKG) -try: - import requests -except ImportError: - print('Please install the "requests" package via pip3.') - exit(errno.ENOPKG) - -# Change working directory to the location of this script -# This fixes relative path references when calling this script from -# outside of the directory containing it -os.chdir(sys.path[0]) - -# Definitions for privileged permissions -ANDROID_MANIFEST_XML = \ - 'https://raw.githubusercontent.com/LineageOS/android_frameworks_base/lineage-22.0/core/res/AndroidManifest.xml' -ANDROID_XML_NS = '{http://schemas.android.com/apk/res/android}' -privileged_permissions = set() -privileged_permission_mask = {'privileged', 'signature'} - -# Get AndroidManifest.xml -req = requests.get(ANDROID_MANIFEST_XML) - -# Parse AndroidManifest.xml to get signature|privileged permissions -root = ElementTree.fromstring(req.text) -for perm in root.findall('permission'): - # Get name of permission - name = perm.get(f'{ANDROID_XML_NS}name') - # Get the protection levels on the permission - levels = set( - perm.get(f'{ANDROID_XML_NS}protectionLevel').split('|')) - # Check if the protections include signature and privileged - levels_masked = levels & privileged_permission_mask - if len(levels_masked) == len(privileged_permission_mask): - privileged_permissions.add(name) - -# List of partitions to check priv-app permissions on -partitions = ['product', 'system_ext'] - -# Definitions for privapp-permissions -# Dictionary with structure: -# partition: permissions_dictionary -# Where permissions_dictionary has the structure: -# package_name : (set(allowed_permissions), set(requested_permissions)) -privapp_permissions_dict = {x: {} for x in partitions} - -# Definitions for privapp-permission allowlists -GLOB_XML_STR = '../*/proprietary/{}/etc/permissions/privapp-permissions*.xml' - -# Parse allowlists to extract allowed privileged permissions -for partition in partitions: - # Get pointer to permissions_dictionary for the partition - perm_dict = privapp_permissions_dict[partition] - # Loop over all the XMLs in the partition we want - for allowlist in glob(GLOB_XML_STR.format(partition)): - # Get root of XML - tree = ElementTree.parse(allowlist) - root = tree.getroot() - # Loop through and find packages - for package in root.findall('privapp-permissions'): - name = package.get('package') - # Create empty entry if it's not in the dictionary - if name not in perm_dict: - perm_dict[name] = (set(), set()) - # Get all permissions and add them to dictionary - for permission in package.findall('permission'): - perm_dict[name][0].add(permission.get('name')) - for permission in package.findall('deny-permission'): - perm_dict[name][0].add(permission.get('name')) - -# Definitions for parsing APKs -GLOB_APK_STR = '../*/proprietary/{}/priv-app/*/*.apk' -AAPT_CMD = ['aapt2', 'd', 'permissions'] - -# Extract requested privileged permissions from all priv-app APKs -for partition in partitions: - # Get pointer to permissions_dictionary for the partition - perm_dict = privapp_permissions_dict[partition] - # Loop over all the APKs in the partition we want - for apk in glob(GLOB_APK_STR.format(partition)): - # Run 'aapt d permissions' on APK - aapt_output = subprocess.check_output(AAPT_CMD + [apk]).decode(encoding='UTF-8') - lines = aapt_output.splitlines() - # Extract package name from the output - # Output looks like: - # package: my.package.name - package_name = parse('package: {}', lines[0])[0] - # Create empty entry if package is not in dict - if package_name not in perm_dict: - perm_dict[package_name] = (set(), set()) - # Extract 'uses-permission' lines from the rest of the output - # Relevant output looks like: - # uses-permission: name='permission' - for line in lines[1:]: - # Extract permission name and add it to the dictionary if it's - # one of the privileged permissions we extracted earlier - if perm_name := parse('uses-permission: name=\'{}\'', line): - if perm_name[0] in privileged_permissions: - perm_dict[package_name][1].add(perm_name[0]) - -# Keep track of exit code -rc = 0 - -# Find all the missing permissions -for partition in partitions: - # Get pointer to permissions_dictionary for the partition - perm_dict = privapp_permissions_dict[partition] - # Loop through all the packages and compare permission sets - for package in perm_dict: - # Get the sets of permissions - # Format is (allowed, requested) - perm_sets = perm_dict[package] - # Compute the set difference requested - allowed - # This gives us all the permissions requested that were not allowed - perm_diff = perm_sets[1] - perm_sets[0] - # If any permissions are left, set exit code to EPERM and print output - if len(perm_diff) > 0: - rc = errno.EPERM - sys.stderr.write( - f"Package {package} on partition {partition} is missing these permissions:\n") - for perm in perm_diff: - sys.stderr.write(f" - {perm}\n") - -# Exit program -exit(rc) +version https://git-lfs.github.com/spec/v1 +oid sha256:c76a3138da3aaf954f708a9be4c345f82c55b7c5113fbc980d3246e5c660eaff +size 6079 diff --git a/common/Android.bp b/common/Android.bp index 3e62741..6c08188 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -1,130 +1,3 @@ -// Automatically generated file. DO NOT MODIFY -// -// This file is generated by device/gapps/common/setup-makefiles.sh - -soong_namespace { - imports: [ - ], -} - -android_app_import { - name: "GoogleCalendarSyncAdapter", - owner: "gapps", - apk: "proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - product_specific: true, -} - -android_app_import { - name: "GoogleContactsSyncAdapter", - owner: "gapps", - apk: "proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - product_specific: true, -} - -android_app_import { - name: "PrebuiltExchange3Google", - owner: "gapps", - apk: "proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - product_specific: true, -} - -android_app_import { - name: "AndroidAutoStub", - owner: "gapps", - apk: "proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "GooglePartnerSetup", - owner: "gapps", - apk: "proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "GoogleFeedback", - owner: "gapps", - apk: "proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - system_ext_specific: true, -} - -android_app_import { - name: "GoogleServicesFramework", - owner: "gapps", - apk: "proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - system_ext_specific: true, -} - -dex_import { - name: "com.google.android.dialer.support", - owner: "gapps", - jars: ["proprietary/product/framework/com.google.android.dialer.support.jar"], - product_specific: true, -} - -android_app_import { - name: "GoogleRestore", - owner: "gapps", - apk: "proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "Wellbeing", - owner: "gapps", - apk: "proprietary/product/priv-app/Wellbeing/Wellbeing.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - +version https://git-lfs.github.com/spec/v1 +oid sha256:f55cdba5e6f9bb7fabb08f8cce0dea5b1e81c74e88bea54e23f5e828813b338c +size 2717 diff --git a/common/Android.mk b/common/Android.mk index 24cade8..cf2bdb6 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -1,9 +1,3 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/common/setup-makefiles.sh - -LOCAL_PATH := $(call my-dir) - -ifneq ($(filter arm arm64 x86_64,$(TARGET_ARCH)),) - -endif +version https://git-lfs.github.com/spec/v1 +oid sha256:2fb8d0416dfda1f15f27dd7fcdc1975b5170c07049f1252488bd2923d9bd84f4 +size 204 diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk index 9ed4296..c6274db 100644 --- a/common/BoardConfigVendor.mk +++ b/common/BoardConfigVendor.mk @@ -1,4 +1,3 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/common/setup-makefiles.sh - +version https://git-lfs.github.com/spec/v1 +oid sha256:890ba40ee4be56019c58e777299d276b65e4cc277f0af26d278627eab4e99911 +size 116 diff --git a/common/common-vendor.mk b/common/common-vendor.mk index 779ffae..f536e18 100644 --- a/common/common-vendor.mk +++ b/common/common-vendor.mk @@ -1,42 +1,3 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/common/setup-makefiles.sh - -PRODUCT_SOONG_NAMESPACES += \ - vendor/gapps/common - -PRODUCT_COPY_FILES += \ - vendor/gapps/common/proprietary/product/etc/default-permissions/default-permissions-google.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions-google.xml \ - vendor/gapps/common/proprietary/product/etc/default-permissions/default-permissions-mtg.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions-mtg.xml \ - vendor/gapps/common/proprietary/product/etc/init/gapps.rc:$(TARGET_COPY_OUT_PRODUCT)/etc/init/gapps.rc \ - vendor/gapps/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.google.android.dialer.support.xml \ - vendor/gapps/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-google-product.xml \ - vendor/gapps/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-mtg.xml \ - vendor/gapps/common/proprietary/product/etc/security/fsverity/gms_fsverity_cert.der:$(TARGET_COPY_OUT_PRODUCT)/etc/security/fsverity/gms_fsverity_cert.der \ - vendor/gapps/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/d2d_cable_migration_feature.xml \ - vendor/gapps/common/proprietary/product/etc/sysconfig/google.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google.xml \ - vendor/gapps/common/proprietary/product/etc/sysconfig/google_build.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google_build.xml \ - vendor/gapps/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google-hiddenapi-package-allowlist.xml \ - vendor/gapps/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-google-system-ext.xml - -PRODUCT_PACKAGES += \ - GoogleCalendarSyncAdapter \ - GoogleContactsSyncAdapter \ - PrebuiltExchange3Google \ - AndroidAutoStub \ - GooglePartnerSetup \ - GoogleFeedback \ - GoogleServicesFramework \ - com.google.android.dialer.support - -ifeq ($(TARGET_IS_GROUPER),) -PRODUCT_COPY_FILES += \ - vendor/gapps/common/proprietary/product/etc/sysconfig/wellbeing.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/wellbeing.xml - -PRODUCT_PACKAGES += \ - GoogleRestore \ - Wellbeing -endif - -PRODUCT_SOONG_NAMESPACES += vendor/gapps/overlay -PRODUCT_PACKAGES += GmsOverlay GmsSettingsOverlay GmsSettingsProviderOverlay GmsSetupWizardOverlay +version https://git-lfs.github.com/spec/v1 +oid sha256:6cbf2034c3fa6c911adb9a7e18c414b05e7befa49480860e15ddb27c6d1ba003 +size 2791 diff --git a/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk b/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk index 4886c42..5cf1adf 100644 Binary files a/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk and b/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk differ diff --git a/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk index 081fa5b..13aacc9 100644 Binary files a/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and b/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ diff --git a/common/proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk b/common/proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk index 9173e9d..816dabe 100644 Binary files a/common/proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk and b/common/proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk differ diff --git a/common/proprietary/product/etc/default-permissions/default-permissions-google.xml b/common/proprietary/product/etc/default-permissions/default-permissions-google.xml index 0b41ad1..4fcda17 100644 --- a/common/proprietary/product/etc/default-permissions/default-permissions-google.xml +++ b/common/proprietary/product/etc/default-permissions/default-permissions-google.xml @@ -1,70 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:4513efc5d1e2efe0619d1b3551a6016813a02beb862c849ef6d6e26f7335ea9c +size 3521 diff --git a/common/proprietary/product/etc/default-permissions/default-permissions-mtg.xml b/common/proprietary/product/etc/default-permissions/default-permissions-mtg.xml index b093d83..8d58ce9 100644 --- a/common/proprietary/product/etc/default-permissions/default-permissions-mtg.xml +++ b/common/proprietary/product/etc/default-permissions/default-permissions-mtg.xml @@ -1,24 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:250a22a5b0fd63140ae3842404d3ea85b5f390962d8350c96ff4b7ce4029a4f3 +size 1453 diff --git a/common/proprietary/product/etc/init/gapps.rc b/common/proprietary/product/etc/init/gapps.rc index 6fd124b..a97ee8f 100644 --- a/common/proprietary/product/etc/init/gapps.rc +++ b/common/proprietary/product/etc/init/gapps.rc @@ -1,3 +1,3 @@ -on init - setprop ro.com.google.gmsversion 15_202408 - setprop ro.opa.eligible_device true +version https://git-lfs.github.com/spec/v1 +oid sha256:73fec552f7939e324162685ab5faa728d65e578ef3f68c8ce983973b42a6fa54 +size 95 diff --git a/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml b/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml index eb53e32..52006b1 100644 --- a/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml +++ b/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml @@ -1,12 +1,3 @@ - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:b3b530828259e81adffbd78cd64735afe65849f78dc2bb09b62e14b8ddef3244 +size 610 diff --git a/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml b/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml index a7706df..9d4eca3 100644 --- a/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml +++ b/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml @@ -1,438 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:b0a0e5e41b67be5a91756aa5f08f8adb411b0a2867ab6e73407fd4a983612762 +size 28081 diff --git a/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml b/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml index 5a0447a..668b158 100644 --- a/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml +++ b/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml @@ -1,13 +1,3 @@ - - - - - - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:9de7ae2a7ed6d643b6d556593a09bb9410cd8a9cb98fee99c85c66eb45f1ee03 +size 601 diff --git a/common/proprietary/product/etc/security/fsverity/gms_fsverity_cert.der b/common/proprietary/product/etc/security/fsverity/gms_fsverity_cert.der index 4f37e1a..032db24 100644 Binary files a/common/proprietary/product/etc/security/fsverity/gms_fsverity_cert.der and b/common/proprietary/product/etc/security/fsverity/gms_fsverity_cert.der differ diff --git a/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml b/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml index cbe323d..23e1c51 100644 --- a/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml +++ b/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml @@ -1,4 +1,3 @@ - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:364372d5bb87bbf22b2628b14e2b56d521fb17ce27df804713c6fbea2eb2088c +size 136 diff --git a/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml b/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml index 130f7d1..e2e0c45 100644 --- a/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml +++ b/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml @@ -1,62 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:47612877a9484d9426a9964843016f0da34153f7f1446fbabcfba7e469790cd1 +size 4259 diff --git a/common/proprietary/product/etc/sysconfig/google.xml b/common/proprietary/product/etc/sysconfig/google.xml index 1c45c4f..f77eda8 100644 --- a/common/proprietary/product/etc/sysconfig/google.xml +++ b/common/proprietary/product/etc/sysconfig/google.xml @@ -1,99 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:edf812885b78966b74f121d13d1ef7120aeab2b51211182b709bfb3c93b91330 +size 6127 diff --git a/common/proprietary/product/etc/sysconfig/google_build.xml b/common/proprietary/product/etc/sysconfig/google_build.xml index 076061f..cf13d4f 100644 --- a/common/proprietary/product/etc/sysconfig/google_build.xml +++ b/common/proprietary/product/etc/sysconfig/google_build.xml @@ -1,24 +1,3 @@ - - - - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:724875dc95f7fb7eb950714f9a474a9a304e081626d9364647e02409e4bdae9c +size 1106 diff --git a/common/proprietary/product/etc/sysconfig/wellbeing.xml b/common/proprietary/product/etc/sysconfig/wellbeing.xml index 332da49..5638e64 100644 --- a/common/proprietary/product/etc/sysconfig/wellbeing.xml +++ b/common/proprietary/product/etc/sysconfig/wellbeing.xml @@ -1,4 +1,3 @@ - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:eb737eb93ffa855638793cf898c9bb73dff81fa48fa0ecaf7707280a9f1b2753 +size 118 diff --git a/common/proprietary/product/framework/com.google.android.dialer.support.jar b/common/proprietary/product/framework/com.google.android.dialer.support.jar index 83bfbfa..e43be6b 100644 Binary files a/common/proprietary/product/framework/com.google.android.dialer.support.jar and b/common/proprietary/product/framework/com.google.android.dialer.support.jar differ diff --git a/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk b/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk index 1645712..38b7ffd 100644 Binary files a/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk and b/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk differ diff --git a/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk index 04f14ee..3be4df1 100644 Binary files a/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and b/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk differ diff --git a/common/proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk b/common/proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk index 5b46e7a..4d2e59f 100644 Binary files a/common/proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk and b/common/proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk differ diff --git a/common/proprietary/product/priv-app/Wellbeing/Wellbeing.apk b/common/proprietary/product/priv-app/Wellbeing/Wellbeing.apk index 5fb153e..71df207 100644 Binary files a/common/proprietary/product/priv-app/Wellbeing/Wellbeing.apk and b/common/proprietary/product/priv-app/Wellbeing/Wellbeing.apk differ diff --git a/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml index a10ba27..a8952c2 100644 --- a/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml +++ b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml @@ -1,76 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:5ad3816372042840de3b9953cb6582fa84e55416100afca4da93b0dcf470aadb +size 4500 diff --git a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk index f70daca..e4b0983 100644 Binary files a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk and b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk differ diff --git a/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk index 2565b73..74212aa 100644 Binary files a/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and b/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ diff --git a/extract-files.sh b/extract-files.sh index bb46826..6ee3805 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -1,52 +1,3 @@ -#!/bin/bash -# -# Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2021 The LineageOS Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -set -e - -export GAPPS_COMMON=common -export VENDOR=gapps - -# Load extract_utils and do some sanity checks -MY_DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi - -ANDROID_ROOT="$MY_DIR/../.." - -export TARGET_ENABLE_CHECKELF=true - -HELPER="$ANDROID_ROOT/tools/extract-utils/extract_utils.sh" -if [ ! -f "$HELPER" ]; then - echo "Unable to find helper script at $HELPER" - exit 1 -fi -. "$HELPER" - -SRC=$1 - -if [ -z "$SRC" ]; then - echo "Path to system dump not specified! Specify one with --path" - exit 1 -fi - -# Initialize the helper for common gapps -setup_vendor "$GAPPS_COMMON" "$VENDOR" "$ANDROID_ROOT" - -extract "$MY_DIR"/proprietary-files-common.txt "$SRC" -extract "$MY_DIR"/proprietary-files-common-nongrouper.txt "$SRC" - -"$MY_DIR"/setup-makefiles.sh +version https://git-lfs.github.com/spec/v1 +oid sha256:1de879c8241ff8d01e3866e76a8c99d75d7ea34cd124f45587b5eeff7fe8d7e1 +size 1430 diff --git a/overlay/GmsOverlay/Android.bp b/overlay/GmsOverlay/Android.bp index 8151e72..ec6752f 100644 --- a/overlay/GmsOverlay/Android.bp +++ b/overlay/GmsOverlay/Android.bp @@ -1,4 +1,3 @@ -runtime_resource_overlay { - name: "GmsOverlay", - product_specific: true -} +version https://git-lfs.github.com/spec/v1 +oid sha256:e8c8842a84fa8fb627e777fdc8f6bfef877604f3e37948015152f71334c4a4ef +size 80 diff --git a/overlay/GmsOverlay/AndroidManifest.xml b/overlay/GmsOverlay/AndroidManifest.xml index 585ee53..31a5980 100644 --- a/overlay/GmsOverlay/AndroidManifest.xml +++ b/overlay/GmsOverlay/AndroidManifest.xml @@ -1,7 +1,3 @@ - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:a9aecfb0bd737c069290e19644562e28dc0efc5b16c47697aab53bb975c78a64 +size 313 diff --git a/overlay/GmsOverlay/apktool.yml b/overlay/GmsOverlay/apktool.yml index b693878..99a6d9c 100644 --- a/overlay/GmsOverlay/apktool.yml +++ b/overlay/GmsOverlay/apktool.yml @@ -1,23 +1,3 @@ -!!brut.androlib.apk.ApkInfo -apkFileName: GmsOverlay.apk -doNotCompress: -- resources.arsc -isFrameworkApk: false -packageInfo: - forcedPackageId: '127' - renameManifestPackage: null -resourcesAreCompressed: false -sdkInfo: - minSdkVersion: '35' - targetSdkVersion: '35' -sharedLibrary: false -sparseResources: true -unknownFiles: {} -usesFramework: - ids: - - 1 - tag: null -version: 2.8.1 -versionInfo: - versionCode: '1' - versionName: '1.0' +version https://git-lfs.github.com/spec/v1 +oid sha256:d19cbf93aed3b3a2c66c515c8fb9928a4caedc5419f176d14df9eeaa88ca045e +size 432 diff --git a/overlay/GmsOverlay/res/values/config.xml b/overlay/GmsOverlay/res/values/config.xml index b2a0a54..00f46e7 100644 --- a/overlay/GmsOverlay/res/values/config.xml +++ b/overlay/GmsOverlay/res/values/config.xml @@ -1,78 +1,3 @@ - - - - ;com.android.vending;com.android.settings; - - - com.google.android.marvin.talkback/.TalkBackService - - - com.google.android.tts - - - com.google.android.apps.wellbeing - - - com.google.android.apps.wellbeing - - - - com.android.dialer - com.google.android.dialer - com.android.server.telecom - android - com.android.systemui - - - - com.google.android.gms:com.google.android.apps.wellbeing - - - - com.google.android.apps.wellbeing - - - - - com.android.vending - - - - com.google.android.projection.gearhead - - - com.google.android.gms/.kids.account.receiver.ProfileOwnerReceiver - - com.google.android.gms.supervision - - - - com.android.settings - com.android.providers.settings - - com.android.vending - com.google.android.gms - - - - com.google.android.googlequicksearchbox - - - com.google.android.gms/com.google.android.gms.nearby.discovery.devices.SavedDevicesSettingsActivity - - - com.google.android.gms - - - com.google.android.apps.work.clouddpc:23962F4B43B9857638EA66F4D419518EAE282491ACDA4B94707BD59003C45E58 - - - com.google.android.gms - - - com.google.android.gms - +version https://git-lfs.github.com/spec/v1 +oid sha256:2db56397a699438c32dde7f1b6677020833641910e99645f31c12743b990f224 +size 4819 diff --git a/overlay/GmsSettingsOverlay/Android.bp b/overlay/GmsSettingsOverlay/Android.bp index 6e6cf6d..78cfb31 100644 --- a/overlay/GmsSettingsOverlay/Android.bp +++ b/overlay/GmsSettingsOverlay/Android.bp @@ -1,4 +1,3 @@ -runtime_resource_overlay { - name: "GmsSettingsOverlay", - product_specific: true -} +version https://git-lfs.github.com/spec/v1 +oid sha256:05a562621f17beb2037b0117cee39e588292a06c033b18bcb37f19184f9dd576 +size 88 diff --git a/overlay/GmsSettingsOverlay/AndroidManifest.xml b/overlay/GmsSettingsOverlay/AndroidManifest.xml index 79e6637..9575fef 100644 --- a/overlay/GmsSettingsOverlay/AndroidManifest.xml +++ b/overlay/GmsSettingsOverlay/AndroidManifest.xml @@ -1,7 +1,3 @@ - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:d806e7c86147cf93a3e3a30da0dcbe6afdc0da9b63462d5bfb01e39573d993b7 +size 334 diff --git a/overlay/GmsSettingsOverlay/apktool.yml b/overlay/GmsSettingsOverlay/apktool.yml index 79e56a1..0beae6c 100644 --- a/overlay/GmsSettingsOverlay/apktool.yml +++ b/overlay/GmsSettingsOverlay/apktool.yml @@ -1,23 +1,3 @@ -!!brut.androlib.apk.ApkInfo -apkFileName: GmsSettingsOverlay.apk -doNotCompress: -- resources.arsc -isFrameworkApk: false -packageInfo: - forcedPackageId: '127' - renameManifestPackage: null -resourcesAreCompressed: false -sdkInfo: - minSdkVersion: '35' - targetSdkVersion: '35' -sharedLibrary: false -sparseResources: true -unknownFiles: {} -usesFramework: - ids: - - 1 - tag: null -version: 2.8.1 -versionInfo: - versionCode: '1' - versionName: '1.0' +version https://git-lfs.github.com/spec/v1 +oid sha256:f53fdf2a70a19d2b27daf3492628a4f5dfaa09afeaf5344a0ef49f3d1866a6ff +size 440 diff --git a/overlay/GmsSettingsOverlay/res/values/config.xml b/overlay/GmsSettingsOverlay/res/values/config.xml index 6dc38e4..49a552c 100644 --- a/overlay/GmsSettingsOverlay/res/values/config.xml +++ b/overlay/GmsSettingsOverlay/res/values/config.xml @@ -1,14 +1,3 @@ - - - - com.google.android.gms.nearby.discovery.EXTRA_INTENT - - - com.google.android.gms.nearby.discovery.EXTRA_PENDING_INTENT - - - com.google.android.gms.nearby.discovery.ACTION_LOG_SLICE_AND_LAUNCH_INTENT - - - com.google.android.gms.nearby.discovery.ACTION_LOG_SLICE_AND_SEND_PENDING_INTENT - +version https://git-lfs.github.com/spec/v1 +oid sha256:dfc457a9eff2f53cf38c788263c2738f0bf793ad60560f1b363bb42d486d6055 +size 1371 diff --git a/overlay/GmsSettingsProviderOverlay/Android.bp b/overlay/GmsSettingsProviderOverlay/Android.bp index 8bb0fc6..3b10c89 100644 --- a/overlay/GmsSettingsProviderOverlay/Android.bp +++ b/overlay/GmsSettingsProviderOverlay/Android.bp @@ -1,4 +1,3 @@ -runtime_resource_overlay { - name: "GmsSettingsProviderOverlay", - product_specific: true -} +version https://git-lfs.github.com/spec/v1 +oid sha256:1c01949936b92a2e83e350a2671723bedaa54f4015a8c5c5de09899d90762770 +size 96 diff --git a/overlay/GmsSettingsProviderOverlay/AndroidManifest.xml b/overlay/GmsSettingsProviderOverlay/AndroidManifest.xml index 417edad..2dae1e6 100644 --- a/overlay/GmsSettingsProviderOverlay/AndroidManifest.xml +++ b/overlay/GmsSettingsProviderOverlay/AndroidManifest.xml @@ -1,7 +1,3 @@ - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:7acb6e32e5928bf585988b438bb8a8e873073acd01d1273e061a544dfe4b2723 +size 352 diff --git a/overlay/GmsSettingsProviderOverlay/apktool.yml b/overlay/GmsSettingsProviderOverlay/apktool.yml index 70900aa..4b7eb65 100644 --- a/overlay/GmsSettingsProviderOverlay/apktool.yml +++ b/overlay/GmsSettingsProviderOverlay/apktool.yml @@ -1,23 +1,3 @@ -!!brut.androlib.apk.ApkInfo -apkFileName: GmsSettingsProviderOverlay.apk -doNotCompress: -- resources.arsc -isFrameworkApk: false -packageInfo: - forcedPackageId: '127' - renameManifestPackage: null -resourcesAreCompressed: false -sdkInfo: - minSdkVersion: '35' - targetSdkVersion: '35' -sharedLibrary: false -sparseResources: true -unknownFiles: {} -usesFramework: - ids: - - 1 - tag: null -version: 2.8.1 -versionInfo: - versionCode: '1' - versionName: '1.0' +version https://git-lfs.github.com/spec/v1 +oid sha256:a492281f8c8e039b8d21a6a78f8a7320042f0c116e5c6dd23b5a7f4e3caee25f +size 448 diff --git a/overlay/GmsSettingsProviderOverlay/res/values/defaults.xml b/overlay/GmsSettingsProviderOverlay/res/values/defaults.xml index 57ebaa5..11249b1 100644 --- a/overlay/GmsSettingsProviderOverlay/res/values/defaults.xml +++ b/overlay/GmsSettingsProviderOverlay/res/values/defaults.xml @@ -1,3 +1,3 @@ - - com.google.android.gms/.backup.BackupTransportService - +version https://git-lfs.github.com/spec/v1 +oid sha256:5220d0cb854464903d8ca0e95f9aac956bd081e4871e4f0510c45175d9abcbc3 +size 128 diff --git a/overlay/GmsSetupWizardOverlay/Android.bp b/overlay/GmsSetupWizardOverlay/Android.bp index 21a1cc3..830c68e 100644 --- a/overlay/GmsSetupWizardOverlay/Android.bp +++ b/overlay/GmsSetupWizardOverlay/Android.bp @@ -1,4 +1,3 @@ -runtime_resource_overlay { - name: "GmsSetupWizardOverlay", - product_specific: true -} +version https://git-lfs.github.com/spec/v1 +oid sha256:7f726726386cbaa613e33bad396cf04f0ef888367df6549d26c673c70b9cf32c +size 91 diff --git a/overlay/GmsSetupWizardOverlay/AndroidManifest.xml b/overlay/GmsSetupWizardOverlay/AndroidManifest.xml index 34f7447..daf1762 100644 --- a/overlay/GmsSetupWizardOverlay/AndroidManifest.xml +++ b/overlay/GmsSetupWizardOverlay/AndroidManifest.xml @@ -1,7 +1,3 @@ - - - - +version https://git-lfs.github.com/spec/v1 +oid sha256:55a9e61facbd1af346a0c904b5b7b332382a39bbc47f45214d63b97935c49355 +size 347 diff --git a/overlay/GmsSetupWizardOverlay/apktool.yml b/overlay/GmsSetupWizardOverlay/apktool.yml index 6bdb5e4..820a6a5 100644 --- a/overlay/GmsSetupWizardOverlay/apktool.yml +++ b/overlay/GmsSetupWizardOverlay/apktool.yml @@ -1,23 +1,3 @@ -!!brut.androlib.apk.ApkInfo -apkFileName: GmsSetupWizardOverlay.apk -doNotCompress: -- resources.arsc -isFrameworkApk: false -packageInfo: - forcedPackageId: '127' - renameManifestPackage: null -resourcesAreCompressed: false -sdkInfo: - minSdkVersion: '35' - targetSdkVersion: '35' -sharedLibrary: false -sparseResources: true -unknownFiles: {} -usesFramework: - ids: - - 1 - tag: null -version: 2.8.1 -versionInfo: - versionCode: '1' - versionName: '1.0' +version https://git-lfs.github.com/spec/v1 +oid sha256:dbadb1c5e4c7fc6076c14e5cc7ec96b1dd55192d4d30ba4fffad34a92fe4f6f8 +size 443 diff --git a/overlay/GmsSetupWizardOverlay/res/values/bools.xml b/overlay/GmsSetupWizardOverlay/res/values/bools.xml index 083f367..c8e89bc 100644 --- a/overlay/GmsSetupWizardOverlay/res/values/bools.xml +++ b/overlay/GmsSetupWizardOverlay/res/values/bools.xml @@ -1,8 +1,3 @@ - - - true - true - true - true - true - +version https://git-lfs.github.com/spec/v1 +oid sha256:d2ec5d8f7121dc3b7b1ed1aabf7219412677e21871277cbf8f09682463e2f55e +size 354 diff --git a/overlay/build_overlays.sh b/overlay/build_overlays.sh index 84165ae..c744d5b 100755 --- a/overlay/build_overlays.sh +++ b/overlay/build_overlays.sh @@ -1,33 +1,3 @@ -#!/bin/bash - -set -e - -GARCH=$1 -GOUT=$2 - -APKTOOL=$GAPPS_TOP/build/apktool/apktool_2.8.1.jar -APKSIGNER=$GAPPS_TOP/build/sign/apksigner.jar - -APK_KEY_PK8=$GAPPS_TOP/build/sign/testkey.pk8 -APK_KEY_PEM=$GAPPS_TOP/build/sign/testkey.x509.pem - -SCRIPT_DIR=$(dirname "$0") -cd "$SCRIPT_DIR" - -OVERLAYS=$(for dir in $(ls -d */); do echo ${dir%%/}; done) - -for OVERLAY in $OVERLAYS; do - PARTITION=$(grep -Eo "\w+_specific: true" $OVERLAY/Android.bp | sed "s/_specific.*$//") - OVERLAY_TARGET_DIR="$GOUT/system/$PARTITION/overlay/" - OVERLAY_TARGET="$OVERLAY_TARGET_DIR/$OVERLAY.apk" - test -d $OVERLAY_TARGET_DIR || mkdir -p $OVERLAY_TARGET_DIR - java -Xmx2048m -jar $APKTOOL b $OVERLAY --use-aapt2 >> $GLOG 2>&1 - touch -amt 200901010000.00 \ - $OVERLAY/build/apk/resources.arsc \ - $OVERLAY/build/apk/AndroidManifest.xml - zip -j $OVERLAY_TARGET -n .arsc \ - $OVERLAY/build/apk/resources.arsc \ - $OVERLAY/build/apk/AndroidManifest.xml >> $GLOG 2>&1 - java -Xmx2048m -jar $APKSIGNER sign --key $APK_KEY_PK8 --cert $APK_KEY_PEM $OVERLAY_TARGET - rm $OVERLAY_TARGET.idsig -done +version https://git-lfs.github.com/spec/v1 +oid sha256:1c3b8b437b5d22f4d0725637f3a6e520192194bdb899d0e32d6037a08c2d1d06 +size 1104 diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt index 516c75d..e9421ad 100644 --- a/proprietary-files-arm-nongrouper.txt +++ b/proprietary-files-arm-nongrouper.txt @@ -1,5 +1,3 @@ -product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk;PRESIGNED -product/app/talkback/talkback.apk;PRESIGNED -product/priv-app/Velvet/Velvet.apk;PRESIGNED - -system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED +version https://git-lfs.github.com/spec/v1 +oid sha256:57d5585fe8a8a4a59cd93d726ec9da61bf4304b1d1e2a6f83fc058df18628dee +size 240 diff --git a/proprietary-files-arm.txt b/proprietary-files-arm.txt index 762a209..f6f936b 100644 --- a/proprietary-files-arm.txt +++ b/proprietary-files-arm.txt @@ -1,3 +1,3 @@ -product/priv-app/GmsCore/GmsCore.apk;PRESIGNED -product/priv-app/Phonesky/Phonesky.apk;PRESIGNED -product/lib/libjni_latinimegoogle.so|cff48167aeff1d47e624b100138a8ad01cb2967b +version https://git-lfs.github.com/spec/v1 +oid sha256:bf47cb3e960f0da5c89fcaf713f357e0c55c27f354bced238cc4104ca799c07e +size 174 diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt index 1ef5c3c..ba0d146 100644 --- a/proprietary-files-arm64-nongrouper.txt +++ b/proprietary-files-arm64-nongrouper.txt @@ -1,7 +1,3 @@ -product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk;PRESIGNED|474ca0e1fb0e6340b647142b3f493055fcb3990f -product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk;PRESIGNED -product/app/talkback/talkback.apk;PRESIGNED -product/priv-app/Velvet/Velvet.apk;PRESIGNED -product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|bb7c2f3fadfee4dda509daba285fec3dfffeed7e - -system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED +version https://git-lfs.github.com/spec/v1 +oid sha256:7557d44a17bbb3600ae78630ff97c44edf1acf4ac00da6986842dfe762aab551 +size 452 diff --git a/proprietary-files-arm64.txt b/proprietary-files-arm64.txt index d4d911a..ae54fb2 100644 --- a/proprietary-files-arm64.txt +++ b/proprietary-files-arm64.txt @@ -1,4 +1,3 @@ -product/priv-app/GmsCore/GmsCore.apk;PRESIGNED -product/priv-app/Phonesky/Phonesky.apk;PRESIGNED -product/lib/libjni_latinimegoogle.so|cff48167aeff1d47e624b100138a8ad01cb2967b -product/lib64/libjni_latinimegoogle.so|08ca8391a1816da0c417a3882e72dabb4091fd3c +version https://git-lfs.github.com/spec/v1 +oid sha256:2960742841476009f72801b756c3ab377673c263e211bb71df52bdb89c69bd93 +size 254 diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt index 9e0c1a5..a884aed 100644 --- a/proprietary-files-common-nongrouper.txt +++ b/proprietary-files-common-nongrouper.txt @@ -1,4 +1,3 @@ -product/etc/sysconfig/wellbeing.xml - -product/priv-app/GoogleRestore/GoogleRestore.apk;PRESIGNED -product/priv-app/Wellbeing/Wellbeing.apk;PRESIGNED +version https://git-lfs.github.com/spec/v1 +oid sha256:f3700f07aa10ca88998ad34267e6140c4404cb938992e6e5c0cb3183448e6c96 +size 147 diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt index c1bbebb..32b510d 100644 --- a/proprietary-files-common.txt +++ b/proprietary-files-common.txt @@ -1,29 +1,3 @@ -product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED -product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED|ec9673f50e4c4dfd2bfcb784d2d8082ef48d1e23 -product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2 - -product/priv-app/AndroidAutoStub/AndroidAutoStub.apk;PRESIGNED -product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED - -product/framework/com.google.android.dialer.support.jar;PRESIGNED - -product/etc/default-permissions/default-permissions-google.xml -product/etc/default-permissions/default-permissions-mtg.xml|b0e11fec4c6d134e205a856733bc89d95f2f24c9 - -product/etc/init/gapps.rc|1b9e076965fe08a03cf90fed0e96f2aa4ac90c0e - -product/etc/permissions/com.google.android.dialer.support.xml -product/etc/permissions/privapp-permissions-google-product.xml -product/etc/permissions/privapp-permissions-mtg.xml|b8bcdbc95f03e6c3e50a015c092d5a4b3fc878d7 - -product/etc/security/fsverity/gms_fsverity_cert.der - -product/etc/sysconfig/d2d_cable_migration_feature.xml -system/etc/sysconfig/google-hiddenapi-package-allowlist.xml:product/etc/sysconfig/google-hiddenapi-package-allowlist.xml -product/etc/sysconfig/google.xml -product/etc/sysconfig/google_build.xml|2547949ac40c1e921ae6e92de6a36f2a3a70802c - -system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED -system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED - -system_ext/etc/permissions/privapp-permissions-google-system-ext.xml +version https://git-lfs.github.com/spec/v1 +oid sha256:dcb1b2f9943529f43cfe92672a97f9654b87ed8ebe39e314e9c060ef91f57e50 +size 1523 diff --git a/proprietary-files-x86_64-nongrouper.txt b/proprietary-files-x86_64-nongrouper.txt index 9aef55c..8930526 100644 --- a/proprietary-files-x86_64-nongrouper.txt +++ b/proprietary-files-x86_64-nongrouper.txt @@ -1,3 +1,3 @@ -product/priv-app/Velvet/Velvet.apk;PRESIGNED - -system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED +version https://git-lfs.github.com/spec/v1 +oid sha256:2599ff49ba2a6ab4855e7d77962a1feac06afa6ffdf386b729249939f3d4c0fb +size 124 diff --git a/proprietary-files-x86_64.txt b/proprietary-files-x86_64.txt index dab78b9..23931db 100644 --- a/proprietary-files-x86_64.txt +++ b/proprietary-files-x86_64.txt @@ -1,4 +1,3 @@ -product/priv-app/GmsCore/GmsCore.apk;PRESIGNED -product/priv-app/Phonesky/Phonesky.apk;PRESIGNED -product/lib/libjni_latinimegoogle.so|40e731390e8372196db987b1d7fd83c204b42e41 -product/lib64/libjni_latinimegoogle.so|67772ec6576feb79748440f765cad6321aef63d0 +version https://git-lfs.github.com/spec/v1 +oid sha256:5f7dcd371ab27a3fc94ce65d30ff859e490461ea9e658457a2279643a71f6e12 +size 254 diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 8435947..c835716 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -1,100 +1,3 @@ -#!/bin/bash -# -# Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2021 The LineageOS Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -set -e - -export DEVICE_COMMON=common -export VENDOR=gapps - -# Load extract_utils and do some sanity checks -MY_DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi - -ANDROID_ROOT="$MY_DIR/../.." - -export TARGET_ENABLE_CHECKELF=true - -HELPER="$ANDROID_ROOT/tools/extract-utils/extract_utils.sh" -if [ ! -f "$HELPER" ]; then - echo "Unable to find helper script at $HELPER" - exit 1 -fi -. "$HELPER" - -# Initialize the helper for common gapps -setup_vendor "$DEVICE_COMMON" "$VENDOR" "$ANDROID_ROOT" true - -# Copyright headers -write_headers "arm arm64 x86_64" - -# Common gapps -write_makefiles "$MY_DIR"/proprietary-files-common.txt - -# Gapps that are too large for grouper -printf "\n" >> "$PRODUCTMK" -echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK" -write_makefiles "$MY_DIR"/proprietary-files-common-nongrouper.txt -echo "endif" >> "$PRODUCTMK" - -# Overlays -cd overlay -OVERLAYS=$(for dir in $(ls -d */); do echo ${dir%%/}; done) -OVERLAYS=$(echo $OVERLAYS | paste -s -d ' ') -cd - >/dev/null -printf "\n" >> "$PRODUCTMK" -echo "PRODUCT_SOONG_NAMESPACES += vendor/$VENDOR/overlay" >> "$PRODUCTMK" -echo "PRODUCT_PACKAGES += $OVERLAYS" >> "$PRODUCTMK" - -sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK" - -# We are done with common -write_footers - -for DEVICE in arm arm64 x86_64; do - -# Reinitialize the helper for target gapps -setup_vendor "$DEVICE" "$VENDOR" "$ANDROID_ROOT" - -# Copyright headers and guards -write_headers "$DEVICE" - -write_makefiles "$MY_DIR"/proprietary-files-$DEVICE.txt - -# Gapps that are too large for grouper -printf "\n" >> "$PRODUCTMK" -echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK" -write_makefiles "$MY_DIR"/proprietary-files-$DEVICE-nongrouper.txt -echo "endif" >> "$PRODUCTMK" - -# Workaround for VelvetTitan on tangorpro -if grep -q "VelvetTitan" "$PRODUCTMK"; then - sed -i '/VelvetTitan/d' "$PRODUCTMK" - printf "\n" >> "$PRODUCTMK" - echo "ifneq (\$(filter %tangorpro,\$(TARGET_PRODUCT)),)" >> "$PRODUCTMK" - echo "PRODUCT_PACKAGES += VelvetTitan" >> "$PRODUCTMK" - echo "endif" >> "$PRODUCTMK" -fi - -printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK" - -sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK" - -# We are done with target -write_footers - -done +version https://git-lfs.github.com/spec/v1 +oid sha256:0b9de5964acb92eaf8a3a588671c78488f670c33350443c294a1e3503e355237 +size 2894 diff --git a/toybox-arm b/toybox-arm index 48acf85..3a48c69 100755 Binary files a/toybox-arm and b/toybox-arm differ diff --git a/toybox-arm64 b/toybox-arm64 index 384cb01..20e4b2a 100755 Binary files a/toybox-arm64 and b/toybox-arm64 differ diff --git a/toybox-x86 b/toybox-x86 index 9a99ac0..d67894a 100755 Binary files a/toybox-x86 and b/toybox-x86 differ diff --git a/toybox-x86_64 b/toybox-x86_64 index f7b989a..ea7f366 100755 Binary files a/toybox-x86_64 and b/toybox-x86_64 differ diff --git a/x86_64/Android.bp b/x86_64/Android.bp index 6dcdfcf..2c6a6b8 100644 --- a/x86_64/Android.bp +++ b/x86_64/Android.bp @@ -1,84 +1,3 @@ -// Automatically generated file. DO NOT MODIFY -// -// This file is generated by device/gapps/x86_64/setup-makefiles.sh - -soong_namespace { - imports: [ - "vendor/gapps/common", - ], -} - -cc_prebuilt_library_shared { - name: "libjni_latinimegoogle", - owner: "gapps", - strip: { - none: true, - }, - target: { - android_x86: { - srcs: ["proprietary/product/lib/libjni_latinimegoogle.so"], - shared_libs: ["libc", "libc++", "libm", "libdl", ], - }, - android_x86_64: { - srcs: ["proprietary/product/lib64/libjni_latinimegoogle.so"], - shared_libs: ["libc", "libc++", "libm", "libdl", ], - }, - }, - compile_multilib: "both", - prefer: true, - product_specific: true, -} - -android_app_import { - name: "GmsCore", - owner: "gapps", - apk: "proprietary/product/priv-app/GmsCore/GmsCore.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "Phonesky", - owner: "gapps", - apk: "proprietary/product/priv-app/Phonesky/Phonesky.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "Velvet", - owner: "gapps", - apk: "proprietary/product/priv-app/Velvet/Velvet.apk", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "SetupWizard", - owner: "gapps", - apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk", - overrides: ["Provision"], - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - system_ext_specific: true, -} - +version https://git-lfs.github.com/spec/v1 +oid sha256:7788e106bce8c4229c82e590914a5b2151e1212dcde2986495308a76330fdf09 +size 1650 diff --git a/x86_64/Android.mk b/x86_64/Android.mk index cca6c3f..a4e5005 100644 --- a/x86_64/Android.mk +++ b/x86_64/Android.mk @@ -1,9 +1,3 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/x86_64/setup-makefiles.sh - -LOCAL_PATH := $(call my-dir) - -ifeq ($(TARGET_ARCH),x86_64) - -endif +version https://git-lfs.github.com/spec/v1 +oid sha256:2b50b213733d2dfa5849d0acc719abdb13cee1071c39e0eb4c123cff23478fd3 +size 182 diff --git a/x86_64/BoardConfigVendor.mk b/x86_64/BoardConfigVendor.mk index 4412af9..0920075 100644 --- a/x86_64/BoardConfigVendor.mk +++ b/x86_64/BoardConfigVendor.mk @@ -1,4 +1,3 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/x86_64/setup-makefiles.sh - +version https://git-lfs.github.com/spec/v1 +oid sha256:00600bb44553df2e014e84abe1d756830597752957b30842765d965d5594cf82 +size 116 diff --git a/x86_64/proprietary/product/lib/libjni_latinimegoogle.so b/x86_64/proprietary/product/lib/libjni_latinimegoogle.so index 13baa88..d9dae22 100644 Binary files a/x86_64/proprietary/product/lib/libjni_latinimegoogle.so and b/x86_64/proprietary/product/lib/libjni_latinimegoogle.so differ diff --git a/x86_64/proprietary/product/lib64/libjni_latinimegoogle.so b/x86_64/proprietary/product/lib64/libjni_latinimegoogle.so index 71c12e9..df9962d 100644 Binary files a/x86_64/proprietary/product/lib64/libjni_latinimegoogle.so and b/x86_64/proprietary/product/lib64/libjni_latinimegoogle.so differ diff --git a/x86_64/proprietary/product/priv-app/GmsCore/GmsCore.apk b/x86_64/proprietary/product/priv-app/GmsCore/GmsCore.apk index a062b50..2bb3d77 100644 Binary files a/x86_64/proprietary/product/priv-app/GmsCore/GmsCore.apk and b/x86_64/proprietary/product/priv-app/GmsCore/GmsCore.apk differ diff --git a/x86_64/proprietary/product/priv-app/Phonesky/Phonesky.apk b/x86_64/proprietary/product/priv-app/Phonesky/Phonesky.apk index 303c71b..c6692ce 100644 Binary files a/x86_64/proprietary/product/priv-app/Phonesky/Phonesky.apk and b/x86_64/proprietary/product/priv-app/Phonesky/Phonesky.apk differ diff --git a/x86_64/proprietary/product/priv-app/Velvet/Velvet.apk b/x86_64/proprietary/product/priv-app/Velvet/Velvet.apk index f237c0a..f3b3b6f 100644 Binary files a/x86_64/proprietary/product/priv-app/Velvet/Velvet.apk and b/x86_64/proprietary/product/priv-app/Velvet/Velvet.apk differ diff --git a/x86_64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk b/x86_64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk index b3709a1..65ce2e1 100644 Binary files a/x86_64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk and b/x86_64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk differ diff --git a/x86_64/x86_64-vendor.mk b/x86_64/x86_64-vendor.mk index 61ee098..9fa26e1 100644 --- a/x86_64/x86_64-vendor.mk +++ b/x86_64/x86_64-vendor.mk @@ -1,21 +1,3 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/x86_64/setup-makefiles.sh - -PRODUCT_SOONG_NAMESPACES += \ - vendor/gapps/x86_64 - - -PRODUCT_PACKAGES += \ - libjni_latinimegoogle \ - GmsCore \ - Phonesky - -ifeq ($(TARGET_IS_GROUPER),) - -PRODUCT_PACKAGES += \ - Velvet \ - SetupWizard -endif - -$(call inherit-product, vendor/gapps/common/common-vendor.mk) +version https://git-lfs.github.com/spec/v1 +oid sha256:5f92557bf6b867906ac1959deb977bbb994d06cf42a961facc4e33ba24aa08ff +size 400