From a34fee2fcb953b615d37818b526f47246f6a8136 Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Mon, 8 Jul 2024 18:58:32 +0100
Subject: [PATCH] Remove Firebase AD_SERVICE_CONFIG property

Change-Id: I084f98af8f7eb739be1053428593a2b880ae33f9
---
 app/prodRelease-badging.txt      | 1 -
 app/src/main/AndroidManifest.xml | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt
index 1e7f8db61..769e0a6e4 100644
--- a/app/prodRelease-badging.txt
+++ b/app/prodRelease-badging.txt
@@ -105,7 +105,6 @@ application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application: label='Now in Android' icon='res/mipmap-anydpi-v26/ic_launcher.xml'
 launchable-activity: name='com.google.samples.apps.nowinandroid.MainActivity'  label='' icon=''
-property: name='android.adservices.AD_SERVICES_CONFIG' resource='res/xml/ga_ad_services_config.xml' 
 uses-library-not-required:'androidx.window.extensions'
 uses-library-not-required:'androidx.window.sidecar'
 uses-library-not-required:'android.ext.adservices'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1f5e13f2f..716305ab6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,6 +58,11 @@
         <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
         <!-- Disable collection of AD_ID for all build variants -->
         <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
+        <!-- Firebase automatically adds the following property which we don't use so remove it -->
+        <property
+            android:name="android.adservices.AD_SERVICES_CONFIG"
+            tools:node="remove" />
+
     </application>
 
 </manifest>