Temporarily remove ump_resources to see if this fixes Windows build hang.

Author: jonsimantov

gma/CMakeLists.txt

@@ -38,17 +38,19 @@ binary_to_array("gma_resources"
     "${FIREBASE_GEN_FILE_DIR}/gma")
 
 # Define the resource build needed for Android
-firebase_cpp_gradle(":gma:ump_resources:generateDexJarRelease"
-    "${CMAKE_CURRENT_LIST_DIR}/ump_resources/build/ump_resources_lib.jar")
-binary_to_array("ump_resources"
-    "${CMAKE_CURRENT_LIST_DIR}/ump_resources/build/ump_resources_lib.jar"
-    "firebase_ump"
-    "${FIREBASE_GEN_FILE_DIR}/gma")
+# TODO(jsimantov): Temporarily remove to diagnose Windows build issue.
+#firebase_cpp_gradle(":gma:ump_resources:generateDexJarRelease"
+#    "${CMAKE_CURRENT_LIST_DIR}/ump_resources/build/ump_resources_lib.jar")
+#binary_to_array("ump_resources"
+#    "${CMAKE_CURRENT_LIST_DIR}/ump_resources/build/ump_resources_lib.jar"
+#    "firebase_ump"
+#    "${FIREBASE_GEN_FILE_DIR}/gma")
 
 # Source files used by the Android implementation.
+# TODO(jsimantov): Temporarily remove to diagnose Windows build issue.
+#    ${ump_resources_source}
 set(android_SRCS
     ${gma_resources_source}
-    ${ump_resources_source}
     src/android/ump/consent_info_internal_android.cc
     src/android/ad_request_converter.cc
     src/android/ad_error_android.cc

gma/build.gradle

@@ -85,5 +85,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('gma')
   setupDexDependencies(':gma:gma_resources')
-  setupDexDependencies(':gma:ump_resources')
+  // TODO(jsimantov): Temporarily remove to diagnose Windows build issue.
+  // setupDexDependencies(':gma:ump_resources')
 }

gma/integration_test/build.gradle

@@ -73,6 +73,9 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  lintOptions {
+    abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

gma/src/android/ump/consent_info_internal_android.cc

@@ -25,7 +25,8 @@
 #include "app/src/thread.h"
 #include "app/src/util_android.h"
 #include "firebase/internal/common.h"
-#include "gma/ump_resources.h"
+// TODO(jsimantov): Temporarily remove to diagnose Windows build issue.
+// #include "gma/ump_resources.h"
 
 namespace firebase {
 namespace gma {
@@ -261,14 +262,17 @@ ConsentInfoInternalAndroid::ConsentInfoInternalAndroid(JNIEnv* env,
   util::Initialize(env, activity);
   env->GetJavaVM(&java_vm_);
 
-  const std::vector<firebase::internal::EmbeddedFile> embedded_files =
-      util::CacheEmbeddedFiles(env, activity,
-                               firebase::internal::EmbeddedFile::ToVector(
-                                   firebase_ump::ump_resources_filename,
-                                   firebase_ump::ump_resources_data,
-                                   firebase_ump::ump_resources_size));
-  if (!(consent_info_helper::CacheClassFromFiles(env, activity,
-                                                 &embedded_files) != nullptr &&
+  // TODO(jsimantov): Temporarily remove to diagnose Windows build issue.
+  // const std::vector<firebase::internal::EmbeddedFile> embedded_files =
+  //     util::CacheEmbeddedFiles(env, activity,
+  //                              firebase::internal::EmbeddedFile::ToVector(
+  //                                  firebase_ump::ump_resources_filename,
+  //                                  firebase_ump::ump_resources_data,
+  //                                  firebase_ump::ump_resources_size));
+  if (
+      // TODO(jsimantov): Temporarily remove to diagnose Windows build issue.
+      // !(consent_info_helper::CacheClassFromFiles(env, activity,
+      //                                            &embedded_files) != nullptr &&
         consent_info_helper::CacheMethodIds(env, activity) &&
         consent_info_helper::CacheFieldIds(env, activity) &&
         consentinformation_consentstatus::CacheFieldIds(env, activity) &&

settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'firebase_cpp_sdk'
+// TODO(jsimantov): Temporarily remove to diagnose Windows build issue.
+//        ':gma:ump_resources',
 include ':app',
         ':app:app_resources',
         ':app:google_api_resources',
@@ -16,7 +18,6 @@ include ':app',
         ':functions',
         ':gma',
         ':gma:gma_resources',
-        ':gma:ump_resources',
         ':installations',
         ':messaging',
         ':messaging:messaging_java',