Revert "DO NOT MERGE: local build optimizations to build.gradle and gradle.properties and settings.gradle"

dconeybe · dconeybe · commit 8b42f3102c89 · 2022-05-27T14:34:41.000-04:00
This reverts commit 809a98f.
diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle
@@ -60,8 +60,6 @@ android {
     versionName '1.0'
     externalNativeBuild.cmake {
       arguments "-DFIREBASE_CPP_SDK_DIR=$gradle.firebase_cpp_sdk_dir"
-      abiFilters 'x86_64'
-      targets 'firebase_firestore', 'firebase_auth', 'android_integration_test_main'
     }
     multiDexEnabled true
   }
diff --git a/firestore/integration_test_internal/gradle.properties b/firestore/integration_test_internal/gradle.properties
diff --git a/settings.gradle b/settings.gradle
@@ -3,7 +3,20 @@ include ':app',
         ':app:app_resources',
         ':app:google_api_resources',
         ':app:invites_resources',
+        ':admob',
+        ':admob:admob_resources',
+        ':analytics',
         ':auth',
         ':auth:auth_resources',
+        ':database',
+        ':database:database_resources',
+        ':dynamic_links',
         ':firestore',
-        ':firestore:firestore_resources'
+        ':firestore:firestore_resources',
+        ':functions',
+        ':installations',
+        ':messaging',
+        ':messaging:messaging_java',
+        ':remote_config',
+        ':storage',
+        ':storage:storage_resources'

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ android {`
`60`	`60`	`versionName '1.0'`
`61`	`61`	`externalNativeBuild.cmake {`
`62`	`62`	`arguments "-DFIREBASE_CPP_SDK_DIR=$gradle.firebase_cpp_sdk_dir"`
`63`		`- abiFilters 'x86_64'`
`64`		`- targets 'firebase_firestore', 'firebase_auth', 'android_integration_test_main'`
`65`	`63`	`}`
`66`	`64`	`multiDexEnabled true`
`67`	`65`	`}`