Merge branch 'master' into f_go_edition

This commit is contained in:
tenzap
2022-06-11 14:07:50 +02:00
committed by GitHub
4 changed files with 12 additions and 3 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ SOURCES="$TOP/sources"
GO_DIR_SUFFIX="-go"
SCRIPTS="$TOP/scripts"
CERTIFICATES="$SCRIPTS/certificates"
APKTOOL="$SCRIPTS/apktool-resources/apktool_2.6.0.jar"
APKTOOL="$SCRIPTS/apktool-resources/apktool_2.6.1.jar"
# shellcheck source=scripts/inc.tools.sh
. "$SCRIPTS/inc.tools.sh"
# shellcheck source=scripts/inc.compatibility.sh
+10 -2
View File
@@ -219,7 +219,11 @@ get_package_info(){
webviewgoogle) packagetype="GApps"; packagename="com.google.android.webview"; packagetarget="app/WebViewGoogle"; packagegappsremove="$webviewgappsremove";;
trichromelibrary) packagetype="GApps"; packagename="com.google.android.trichromelibrary"; packagetarget="app/TrichromeLibrary";;
webviewstub) packagetype="GApps"; packagename="com.google.android.webview.stub"; packagetarget="app/WebViewStub";;
gearheadstub) packagetype="GApps"; packagename="com.google.android.projection.gearhead.stub"; packagetarget="priv-app/AndroidAutoPrebuiltStub";;
gearheadstub) packagetype="GApps"; packagename="com.google.android.projection.gearhead.stub"; packagetarget="priv-app/AndroidAutoPrebuiltStub"
if [ "$API" -ge "31" ]; then # Add an overlay for Android 12.0 +
packagefiles="product/overlay/AndroidAutoOverlay.apk"
packagegappsremove="product/overlay/AndroidAutoOverlay.apk vendor/overlay/AndroidAutoOverlay.apk"
fi;;
# Regular GApps
backuprestore) packagetype="Core"; packagename="com.google.android.apps.restore"; packagetarget="priv-app/GoogleRestore";;
@@ -290,7 +294,11 @@ get_package_info(){
packagegappsremove="product/overlay/ActionsServicesOverlay.apk vendor/overlay/ActionsServicesOverlay.apk"
fi;;
quickaccesswallet) packagetype="GApps"; packagename="com.android.systemui.plugin.globalactions.wallet"; packagetarget="priv-app/QuickAccessWallet";;
androidauto) packagetype="GApps"; packagename="com.google.android.projection.gearhead"; packagetarget="app/AndroidAutoPrebuilt";;
androidauto) packagetype="GApps"; packagename="com.google.android.projection.gearhead"; packagetarget="app/AndroidAutoPrebuilt"
if [ "$API" -ge "31" ]; then # Add an overlay for Android 12.0 +
packagefiles="product/overlay/AndroidAutoOverlay.apk"
packagegappsremove="product/overlay/AndroidAutoOverlay.apk vendor/overlay/AndroidAutoOverlay.apk"
fi;;
assistantgo) packagetype="GApps"; packagename="com.google.android.apps.assistant"; packagetarget="priv-app/AssistantGo"; packagedirsuffix="-go";;
batteryusage) packagetype="GApps"; packagename="com.google.android.apps.turbo"; packagetarget="priv-app/Turbo";;
bettertogether) packagetype="GApps"; packagename="com.google.android.apps.multidevice.client"; packagetarget="app/SMSConnectPrebuilt";;
+1
View File
@@ -278,6 +278,7 @@ priv-app/Camera@REMOVALSUFFIX@
priv-app/CameraX@REMOVALSUFFIX@
priv-app/MiuiCamera@REMOVALSUFFIX@
priv-app/MotCamera@REMOVALSUFFIX@
priv-app/MotCamera2@REMOVALSUFFIX@
priv-app/MtkCamera@REMOVALSUFFIX@
priv-app/MTKCamera@REMOVALSUFFIX@
priv-app/SnapdragonCamera@REMOVALSUFFIX@