Add wellbeing.xml

Doesn't seem like x86 GMS exists anymore as it's not available as GSI
nor Android SDK image.

README.md

@@ -16,16 +16,13 @@ _make gapps_arm_
 _make gapps_arm64_
 - compile signed flashable GApps for arm64
 
-_make gapps_x86_
-- compile signed flashable GApps for x86
-
 _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, x86, or x86_64 depending on the device's architecture
+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
 -------------------

build/gapps.sh

@@ -89,16 +89,16 @@ function zipit() {
     fi
 }
 
-function getmd5() {
+function getsha256() {
-    if [ -x $(which md5sum) ]; then
+    if [ -x $(which sha256sum) ]; then
-        echo "md5sum is installed, getting md5..." >> $GLOG
+        echo "sha256sum is installed, getting sha256..." >> $GLOG
-        echo "Getting md5sum..."
+        echo "Getting sha256sum..."
-        GMD5=$(md5sum $OUT/$BUILDZIP)
+        GSHA256=$(sha256sum $OUT/$BUILDZIP)
-        echo -e "$GMD5" > $OUT/$BUILDZIP.md5sum
+        echo -e "$GSHA256" > $OUT/$BUILDZIP.sha256sum
-        echo "md5 exported at $OUT/$BUILDZIP.md5sum"
+        echo "sha256 exported at $OUT/$BUILDZIP.sha256sum"
         return 0
     else
-        echo "md5sum is not installed, aborting" >> $GLOG
+        echo "sha256sum is not installed, aborting" >> $GLOG
         return 1
     fi
 }
@@ -113,7 +113,7 @@ else
     echo "No realpath found!" >> $GLOG
 fi
 
-for func in create zipit getmd5 clean; do
+for func in create zipit getsha256 clean; do
     $func
     ret=$?
     if [ "$ret" == 0 ]; then
@@ -124,5 +124,5 @@ for func in create zipit getmd5 clean; do
 done
 
 echo "Done!" >> $GLOG
-echo "Build completed: $GMD5"
+echo "Build completed: $GSHA256"
 exit 0

build/main.mk

@@ -17,10 +17,6 @@ gapps_arm64:
 	@echo "Compiling GApps for arm64..."
 	@bash $(BUILD_GAPPS) arm64 2>&1
 
-gapps_x86:
-	@echo "Compiling GApps for x86..."
-	@bash $(BUILD_GAPPS) x86 2>&1
-
 gapps_x86_64:
 	@echo "Compiling GApps for x86_64..."
 	@bash $(BUILD_GAPPS) x86_64 2>&1

common/Android.mk

@@ -4,6 +4,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter arm arm64 x86 x86_64,$(TARGET_ARCH)),)
+ifneq ($(filter arm arm64 x86_64,$(TARGET_ARCH)),)
 
 endif

common/common-vendor.mk

@@ -11,6 +11,7 @@ PRODUCT_COPY_FILES += \
     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 \
@@ -29,6 +30,8 @@ PRODUCT_PACKAGES += \
     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 \

common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml

@@ -366,9 +366,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.STOP_APP_SWITCHES"/>
         <permission name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON"/>
         <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="android.permission.WRITE_DREAM_STATE"/>
-        <permission name="android.permission.QUERY_USERS"/>
-        <permission name="android.permission.READ_DREAM_STATE"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.hotwordenrollment.okgoogle">

common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.google.android.googlequicksearchbox">
+        <permission name="android.permission.QUERY_USERS"/>
+        <permission name="android.permission.READ_DREAM_STATE"/>
+        <permission name="android.permission.WRITE_DREAM_STATE"/>
+    </privapp-permissions>
+</permissions>

common/proprietary/product/etc/sysconfig/wellbeing.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+    <feature name="com.google.android.feature.WELLBEING" />
+</config>

proprietary-files-common-nongrouper.txt

@@ -1,2 +1,4 @@
+product/etc/sysconfig/wellbeing.xml
+
 product/priv-app/GoogleRestore/GoogleRestore.apk;PRESIGNED
 product/priv-app/Wellbeing/Wellbeing.apk;PRESIGNED

proprietary-files-common.txt

@@ -14,6 +14,7 @@ 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|926d8fbcfbf4711a4bc96777595b70b874ef7334
 
 product/etc/security/fsverity/gms_fsverity_cert.der
 

proprietary-files-x86-nongrouper.txt

@@ -1,3 +0,0 @@
-product/priv-app/Velvet/Velvet.apk;PRESIGNED
-
-system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED

proprietary-files-x86.txt

@@ -1,3 +0,0 @@
-product/priv-app/GmsCore/GmsCore.apk;PRESIGNED
-product/priv-app/Phonesky/Phonesky.apk;PRESIGNED
-product/lib/libjni_latinimegoogle.so|40e731390e8372196db987b1d7fd83c204b42e41

setup-makefiles.sh

@@ -40,7 +40,7 @@ fi
 setup_vendor "$DEVICE_COMMON" "$VENDOR" "$ANDROID_ROOT" true
 
 # Copyright headers
-write_headers "arm arm64 x86 x86_64"
+write_headers "arm arm64 x86_64"
 
 # Common gapps
 write_makefiles "$MY_DIR"/proprietary-files-common.txt
@@ -65,7 +65,7 @@ sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 # We are done with common
 write_footers
 
-for DEVICE in arm arm64 x86 x86_64; do
+for DEVICE in arm arm64 x86_64; do
 
 # Reinitialize the helper for target gapps
 setup_vendor "$DEVICE" "$VENDOR" "$ANDROID_ROOT"

x86/Android.bp

@@ -1,80 +0,0 @@
-// Automatically generated file. DO NOT MODIFY
-//
-// This file is generated by device/gapps/x86/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", ],
-		},
-	},
-	compile_multilib: "32",
-	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,
-}
-

x86/Android.mk

@@ -1,9 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/gapps/x86/setup-makefiles.sh
-
-LOCAL_PATH := $(call my-dir)
-
-ifeq ($(TARGET_ARCH),x86)
-
-endif

x86/BoardConfigVendor.mk

@@ -1,4 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/gapps/x86/setup-makefiles.sh
-

x86/x86-vendor.mk

@@ -1,21 +0,0 @@
-# Automatically generated file. DO NOT MODIFY
-#
-# This file is generated by device/gapps/x86/setup-makefiles.sh
-
-PRODUCT_SOONG_NAMESPACES += \
-    vendor/gapps/x86
-
-
-PRODUCT_PACKAGES += \
-    libjni_latinimegoogle \
-    GmsCore \
-    Phonesky
-
-ifeq ($(TARGET_IS_GROUPER),)
-
-PRODUCT_PACKAGES += \
-    Velvet \
-    SetupWizard
-endif
-
-$(call inherit-product, vendor/gapps/common/common-vendor.mk)