From 735630c5e37685ae724b0f55fdb968a537e35138 Mon Sep 17 00:00:00 2001
From: WSTxda <wstxda@gmail.com>
Date: Wed, 5 Jun 2024 11:48:26 -0300
Subject: [PATCH] Change default group id to ReVanced

---
 play-services-base/build.gradle                           | 3 +++
 play-services-basement/src/main/AndroidManifest.xml       | 2 +-
 play-services-cast-framework/build.gradle                 | 4 ++++
 play-services-cast-framework/src/main/AndroidManifest.xml | 8 ++++----
 play-services-cast/core/build.gradle                      | 4 ++++
 play-services-cast/core/src/main/AndroidManifest.xml      | 2 +-
 play-services-core/src/main/AndroidManifest.xml           | 2 +-
 play-services-gcm/build.gradle                            | 4 ++++
 play-services-gcm/src/main/AndroidManifest.xml            | 2 +-
 .../com/google/android/gms/gcm/GcmListenerService.java    | 2 +-
 .../com/google/android/gms/gcm/GcmNetworkManager.java     | 4 ++--
 .../main/java/com/google/android/gms/gcm/GcmReceiver.java | 8 ++++----
 .../java/com/google/android/gms/gcm/GcmTaskService.java   | 4 ++--
 play-services-iid/build.gradle                            | 4 ++++
 play-services-iid/src/main/AndroidManifest.xml            | 2 +-
 .../google/android/gms/iid/InstanceIDListenerService.java | 2 +-
 16 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle
index dc7a3f4d52..057c80fd22 100644
--- a/play-services-base/build.gradle
+++ b/play-services-base/build.gradle
@@ -30,12 +30,15 @@ android {
 
     buildFeatures {
         aidl = true
+        buildConfig = true
     }
 
     defaultConfig {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+
+        buildConfigField "String", "BASE_PACKAGE_NAME", "\"$basePackageName\""
     }
 
     compileOptions {
diff --git a/play-services-basement/src/main/AndroidManifest.xml b/play-services-basement/src/main/AndroidManifest.xml
index 06561f90b1..442d0642c2 100644
--- a/play-services-basement/src/main/AndroidManifest.xml
+++ b/play-services-basement/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <meta-data
-                android:name="com.google.android.gms.version"
+                android:name="${basePackageName}.android.gms.version"
                 android:value="$appVersionCode"/>
     </application>
 </manifest>
diff --git a/play-services-cast-framework/build.gradle b/play-services-cast-framework/build.gradle
index 267c69ac90..dbc01758bf 100644
--- a/play-services-cast-framework/build.gradle
+++ b/play-services-cast-framework/build.gradle
@@ -21,6 +21,10 @@ android {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+
+        manifestPlaceholders = [
+                basePackageName: "$basePackageName"
+        ]
     }
 
     compileOptions {
diff --git a/play-services-cast-framework/src/main/AndroidManifest.xml b/play-services-cast-framework/src/main/AndroidManifest.xml
index 4fddd28710..3de4f33dd1 100644
--- a/play-services-cast-framework/src/main/AndroidManifest.xml
+++ b/play-services-cast-framework/src/main/AndroidManifest.xml
@@ -9,21 +9,21 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
     <queries>
-        <package android:name="com.google.android.gms.policy_cast_dynamite"/>
+        <package android:name="${basePackageName}.android.gms.policy_cast_dynamite"/>
     </queries>
 
     <application>
         <receiver
-                android:name="com.google.android.gms.cast.framework.media.MediaIntentReceiver"
+                android:name="${basePackageName}.android.gms.cast.framework.media.MediaIntentReceiver"
                 android:exported="false"/>
 
         <service
-                android:name="com.google.android.gms.cast.framework.media.MediaNotificationService"
+                android:name="${basePackageName}.android.gms.cast.framework.media.MediaNotificationService"
                 android:exported="false"
                 android:foregroundServiceType="mediaPlayback"/>
 
         <service
-                android:name="com.google.android.gms.cast.framework.ReconnectionService"
+                android:name="${basePackageName}.android.gms.cast.framework.ReconnectionService"
                 android:exported="false"/>
     </application>
 
diff --git a/play-services-cast/core/build.gradle b/play-services-cast/core/build.gradle
index 787acccc56..9a256ed892 100644
--- a/play-services-cast/core/build.gradle
+++ b/play-services-cast/core/build.gradle
@@ -32,6 +32,10 @@ android {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+
+        manifestPlaceholders = [
+                basePackageName: "$basePackageName"
+        ]
     }
 
     buildFeatures {
diff --git a/play-services-cast/core/src/main/AndroidManifest.xml b/play-services-cast/core/src/main/AndroidManifest.xml
index f25508e6ae..d1095e801b 100644
--- a/play-services-cast/core/src/main/AndroidManifest.xml
+++ b/play-services-cast/core/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
 
         <service android:name="org.microg.gms.cast.CastDeviceControllerService">
             <intent-filter>
-                <action android:name="com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE" />
+                <action android:name="${basePackageName}.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE" />
             </intent-filter>
         </service>
     </application>
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index ec37cabfac..d1cb995cc5 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -71,7 +71,7 @@
     <uses-permission android:name="${basePackageName}.android.c2dm.permission.SEND" />
     <uses-permission android:name="${basePackageName}.android.gtalkservice.permission.GTALK_SERVICE" />
 
-    <uses-permission android:name="org.microg.gms.STATUS_BROADCAST" />
+    <uses-permission android:name="${basePackageName}.microg.gms.STATUS_BROADCAST" />
 
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
diff --git a/play-services-gcm/build.gradle b/play-services-gcm/build.gradle
index 60c68023f8..b888c28654 100644
--- a/play-services-gcm/build.gradle
+++ b/play-services-gcm/build.gradle
@@ -15,6 +15,10 @@ android {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+
+        manifestPlaceholders = [
+                basePackageName: "$basePackageName"
+        ]
     }
 
     compileOptions {
diff --git a/play-services-gcm/src/main/AndroidManifest.xml b/play-services-gcm/src/main/AndroidManifest.xml
index 31cd4d453a..cfc1bb78f3 100644
--- a/play-services-gcm/src/main/AndroidManifest.xml
+++ b/play-services-gcm/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Permissions required for GCM -->
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+    <uses-permission android:name="${basePackageName}.android.c2dm.permission.RECEIVE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <!-- Move to play-services-measurement -->
diff --git a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java
index ccf99acf61..6d911479a2 100644
--- a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java
+++ b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmListenerService.java
@@ -53,7 +53,7 @@
  *     android:name=".YourGcmListenerService"
  *     android:exported="false" >
  *     <intent-filter>
- *         <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+ *         <action android:name="${basePackageName}.android.c2dm.intent.RECEIVE" />
  *     </intent-filter>
  * </service></pre>
  */
diff --git a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmNetworkManager.java b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmNetworkManager.java
index a7ee9a8940..fc809ce25d 100644
--- a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmNetworkManager.java
+++ b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmNetworkManager.java
@@ -67,9 +67,9 @@
  * <pre>
  * <service android:name=".MyUploadService"
  *     android:exported="true"
- *     android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE" >
+ *     android:permission="${basePackageName}.android.gms.permission.BIND_NETWORK_TASK_SERVICE" >
  *     <intent-filter>
- *        <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
+ *        <action android:name="${basePackageName}.android.gms.gcm.ACTION_TASK_READY" />
  *     </intent-filter>
  * </service>
  * </pre>
diff --git a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java
index 1df70bccb0..ed3d5b96a1 100644
--- a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java
+++ b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmReceiver.java
@@ -44,12 +44,12 @@
  * <p/>
  * <pre>
  * <receiver
- *     android:name="com.google.android.gms.gcm.GcmReceiver"
+ *     android:name="${basePackageName}.android.gms.gcm.GcmReceiver"
  *     android:exported="true"
- *     android:permission="com.google.android.c2dm.permission.SEND" >
+ *     android:permission="${basePackageName}.android.c2dm.permission.SEND" >
  *     <intent-filter>
- *         <action android:name="com.google.android.c2dm.intent.RECEIVE" />
- *         <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+ *         <action android:name="${basePackageName}.android.c2dm.intent.RECEIVE" />
+ *         <action android:name="${basePackageName}.android.c2dm.intent.REGISTRATION" />
  *         <category android:name="YOUR_PACKAGE_NAME" />
  *     </intent-filter>
  * </receiver></pre>
diff --git a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmTaskService.java b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmTaskService.java
index 0d790589ca..ba7ca20d55 100644
--- a/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmTaskService.java
+++ b/play-services-gcm/src/main/java/com/google/android/gms/gcm/GcmTaskService.java
@@ -38,10 +38,10 @@
  * {@link com.google.android.gms.gcm.GcmTaskService#SERVICE_ACTION_EXECUTE_TASK}. Here's an example:
  * <pre>
  *     <service android:name="MyTaskService"
- *              android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
+ *              android:permission="${basePackageName}.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
  *              android:exported="true">
  *              <intent-filter>
- *                  <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY"/>
+ *                  <action android:name="${basePackageName}.android.gms.gcm.ACTION_TASK_READY"/>
  *              </intent-filter>
  *     </service>
  * </pre>
diff --git a/play-services-iid/build.gradle b/play-services-iid/build.gradle
index d6b9231620..b7e9024f76 100644
--- a/play-services-iid/build.gradle
+++ b/play-services-iid/build.gradle
@@ -19,6 +19,10 @@ android {
         versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
+
+        manifestPlaceholders = [
+                basePackageName: "$basePackageName"
+        ]
     }
 
     compileOptions {
diff --git a/play-services-iid/src/main/AndroidManifest.xml b/play-services-iid/src/main/AndroidManifest.xml
index 5a3b72361e..21c850f3d1 100644
--- a/play-services-iid/src/main/AndroidManifest.xml
+++ b/play-services-iid/src/main/AndroidManifest.xml
@@ -7,6 +7,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Permissions required for IID -->
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+    <uses-permission android:name="${basePackageName}.android.c2dm.permission.RECEIVE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
diff --git a/play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java b/play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java
index c7bf61c78e..6e160f6550 100644
--- a/play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java
+++ b/play-services-iid/src/main/java/com/google/android/gms/iid/InstanceIDListenerService.java
@@ -43,7 +43,7 @@
  * <pre>
  * <service android:name=".YourInstanceIDListenerService" android:exported="false">
  *     <intent-filter>
- *         <action android:name="com.google.android.gms.iid.InstanceID"/>
+ *         <action android:name="${basePackageName}.android.gms.iid.InstanceID"/>
  *     </intent-filter>
  * </service></pre>
  * Do not export this service. Instead, keep it private to prevent other apps