Some few lingering changes needed.

Author: jonsimantov

CMakeLists.txt

@@ -634,7 +634,7 @@ if (FIREBASE_INCLUDE_GMA)
   add_subdirectory(gma)
 endif()
 if (FIREBASE_INCLUDE_UMP)
-  add_subdirectory(gma)
+  add_subdirectory(ump)
 endif()
 if (FIREBASE_INCLUDE_INSTALLATIONS)
   add_subdirectory(installations)

app/CMakeLists.txt

@@ -566,6 +566,10 @@ if (IOS)
     ${FIREBASE_SOURCE_DIR}/storage/src/include/firebase/storage/listener.h
     ${FIREBASE_SOURCE_DIR}/storage/src/include/firebase/storage/metadata.h
     ${FIREBASE_SOURCE_DIR}/storage/src/include/firebase/storage/storage_reference.h)
+  set(ump_HDRS
+    ${FIREBASE_SOURCE_DIR}/ump/src/include/firebase/ump.h
+    ${FIREBASE_SOURCE_DIR}/ump/src/include/firebase/ump/consent_info.h
+    ${FIREBASE_SOURCE_DIR}/ump/src/include/firebase/ump/types.h)
 
   list(APPEND framework_HDRS
     src/include/firebase/internal/platform.h
@@ -580,7 +584,9 @@ if (IOS)
     ${installations_HDRS}
     ${messaging_HDRS}
     ${remote_config_HDRS}
-    ${storage_HDRS})
+    ${storage_HDRS}
+    ${ump_HDRS}
+    )
 
   # add framework header files to target
   target_sources(firebase_app PRIVATE ${framework_HDRS})

settings.gradle

@@ -24,4 +24,4 @@ include ':app',
         ':storage',
         ':storage:storage_resources'
         ':ump',
-        ':ump:gma_resources',
+        ':ump:ump_resources',

setup_integration_tests.py

@@ -45,6 +45,7 @@
     'messaging/integration_test',
     'remote_config/integration_test',
     'storage/integration_test',
+    'ump/integration_test',
 ]
 
 destinations = sys.argv[1:] if len(sys.argv) > 1 else DEFAULT_DESTINATIONS