Update Android dependencies.

Author: jonsimantov

Android/firebase_dependencies.gradle

@@ -29,8 +29,6 @@ def firebaseDependenciesMap = [
   'functions' : ['com.google.firebase:firebase-functions'],
   'gma' : ['com.google.android.gms:play-services-ads:23.0.0',
            'com.google.android.ump:user-messaging-platform:2.2.0'],
-  'ump' : ['com.google.android.gms:play-services-ads:23.0.0',
-           'com.google.android.ump:user-messaging-platform:2.2.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
   // Messaging has an additional local dependency to include.
@@ -41,7 +39,8 @@ def firebaseDependenciesMap = [
   'performance' : ['com.google.firebase:firebase-perf'],
   'remote_config' : ['com.google.firebase:firebase-config'],
   'storage' : ['com.google.firebase:firebase-storage'],
-  'testlab' : []
+  'testlab' : [],
+  'ump' : ['com.google.android.ump:user-messaging-platform:2.2.0']
 ]
 
 // A map of library to the gradle resources that they depend upon.
@@ -56,6 +55,7 @@ def firebaseResourceDependenciesMap = [
   'gma' : [':gma:gma_resources'],
   'remote_config' : [':remote_config:remote_config_resources'],
   'storage' : [':storage:storage_resources']
+  'ump' : [':ump:ump_resources'],
 ]
 
 def setResourceDependencies(String subproject) {
@@ -118,6 +118,9 @@ class Dependencies {
   def getStorage() {
     libSet.add('storage')
   }
+  def getUmp() {
+    libSet.add('ump')
+  }
 }
 
 // Extension to handle which Firebase C++ dependencies are being added to the

build_scripts/ios/build.sh

@@ -27,7 +27,7 @@ readonly SUPPORTED_PLATFORMS=(device simulator)
 readonly SUPPORTED_ARCHITECTURES=(arm64 x86_64)
 readonly DEVICE_ARCHITECTURES=(arm64)
 readonly SIMULATOR_ARCHITECTURES=(arm64 x86_64)
-readonly SUPPORTED_TARGETS=(firebase_analytics firebase_auth firebase_app_check firebase_database firebase_dynamic_links firebase_firestore firebase_functions firebase_gma firebase_installations firebase_messaging firebase_remote_config firebase_storage)
+readonly SUPPORTED_TARGETS=(firebase_analytics firebase_auth firebase_app_check firebase_database firebase_dynamic_links firebase_firestore firebase_functions firebase_gma firebase_installations firebase_messaging firebase_remote_config firebase_storage firebase_ump)
 
 # build default value
 buildpath="ios_build"

release_build_files/Android/firebase_dependencies.gradle

@@ -29,8 +29,6 @@ def firebaseDependenciesMap = [
   'functions' : ['com.google.firebase:firebase-functions'],
   'gma' : ['com.google.android.gms:play-services-ads:23.0.0',
            'com.google.android.ump:user-messaging-platform:2.2.0'],
-  'ump' : ['com.google.android.gms:play-services-ads:23.0.0',
-           'com.google.android.ump:user-messaging-platform:2.2.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
   // Messaging has an additional local dependency to include.
@@ -41,7 +39,8 @@ def firebaseDependenciesMap = [
   'performance' : ['com.google.firebase:firebase-perf'],
   'remote_config' : ['com.google.firebase:firebase-config'],
   'storage' : ['com.google.firebase:firebase-storage'],
-  'testlab' : []
+  'testlab' : [],
+  'ump' : ['com.google.android.ump:user-messaging-platform:2.2.0']
 ]
 
 // Handles adding the Firebase C++ dependencies as properties.
@@ -100,6 +99,9 @@ class Dependencies {
   def getTestlab() {
     libSet.add('testlab')
   }
+  def getUmp() {
+    libSet.add('ump')
+  }
 }
 
 // Extension to handle which Firebase C++ dependencies are being added to the