Stop using android.enableGlobalSyntheticsGeneration

This is a follow up CL for ag/22930592 which didn't fully move us to
using the new optional flag.

Bug: 254510065
Test: existing
Change-Id: Ibf2d466feb69345338079372edf5642639b5ab59
(cherry picked from commit d97d6ab38122580e87d017c97a46f68442416020)

7 files changed, 6 insertions, 11 deletions

diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt
index 374132d0d4..08f7ed194d 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt
@@ -1263,7 +1263,7 @@ abstract class TaskManager(
             separateFileDependenciesDexingTask
         )
 
-        if (creationConfig.services.projectOptions[BooleanOption.ENABLE_GLOBAL_SYNTHETICS]) {
+        if (creationConfig.enableGlobalSynthetics) {
             if (dexingType == DexingType.NATIVE_MULTIDEX) {
                 taskFactory.register(
                     GlobalSyntheticsMergeTask.CreationAction(
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexArchiveBuilderTask.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexArchiveBuilderTask.kt
index b64a5fa06a..3609e5c0d4 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexArchiveBuilderTask.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexArchiveBuilderTask.kt
@@ -296,7 +296,7 @@ abstract class DexArchiveBuilderTask : NewIncrementalTask() {
                 taskProvider,
                 DexArchiveBuilderTask::previousRunNumberOfBucketsFile
             ).withName("out").on(InternalArtifactType.DEX_NUMBER_OF_BUCKETS_FILE)
-            if (creationConfig.services.projectOptions[BooleanOption.ENABLE_GLOBAL_SYNTHETICS]) {
+            if (creationConfig.enableGlobalSynthetics) {
                 creationConfig.artifacts.setInitialProvider(
                     taskProvider
                 ) { it.projectOutputs.globalSynthetics }
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexFileDependenciesTask.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexFileDependenciesTask.kt
index 9e8fb4b97b..c382775d8d 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexFileDependenciesTask.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexFileDependenciesTask.kt
@@ -180,7 +180,7 @@ abstract class DexFileDependenciesTask: NonIncrementalTask() {
                 DexFileDependenciesTask::outputDirectory
             ).on(InternalArtifactType.EXTERNAL_FILE_LIB_DEX_ARCHIVES)
 
-            if (creationConfig.services.projectOptions[BooleanOption.ENABLE_GLOBAL_SYNTHETICS]) {
+            if (creationConfig.enableGlobalSynthetics) {
                 creationConfig.artifacts
                     .setInitialProvider(taskProvider, DexFileDependenciesTask::outputGlobalSynthetics)
                     .on(InternalArtifactType.GLOBAL_SYNTHETICS_FILE_LIB)
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexMergingTask.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexMergingTask.kt
index 31f27dbc3e..11d59c0191 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexMergingTask.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/DexMergingTask.kt
@@ -334,7 +334,7 @@ abstract class DexMergingTask : NewIncrementalTask() {
                     task.fileDependencyDexDir
                 )
             }
-            if (creationConfig.services.projectOptions[BooleanOption.ENABLE_GLOBAL_SYNTHETICS]
+            if (creationConfig.enableGlobalSynthetics
                 && creationConfig.dexingCreationConfig.dexingType != NATIVE_MULTIDEX) {
                 task.globalSynthetics.from(
                     getGlobalSyntheticsInput(
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/PerModuleBundleTask.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/PerModuleBundleTask.kt
index d21f7513eb..0c66e0acd1 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/PerModuleBundleTask.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/tasks/PerModuleBundleTask.kt
@@ -335,7 +335,7 @@ abstract class PerModuleBundleTask: NonIncrementalTask() {
                     artifacts.get(InternalArtifactType.DESUGAR_LIB_DEX)
                 )
             }
-            if (creationConfig.services.projectOptions[BooleanOption.ENABLE_GLOBAL_SYNTHETICS]
+            if (creationConfig.enableGlobalSynthetics
                 && creationConfig.dexingCreationConfig.dexingType == DexingType.NATIVE_MULTIDEX
                 && !creationConfig.optimizationCreationConfig.minifiedEnabled) {
                 task.dexFiles.from(
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/PackageAndroidArtifact.java b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/PackageAndroidArtifact.java
index f9d12d6917..37bebf9f84 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/PackageAndroidArtifact.java
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/PackageAndroidArtifact.java
@@ -1466,10 +1466,7 @@ public abstract class PackageAndroidArtifact extends NewIncrementalTask {
             //   2. R8 is used and global synthetics are not generated
             //   3. In mono dex and legacy multidex where global synthetics are already merged into
             //      dex files in dex merging tasks
-            if (!creationConfig
-                            .getServices()
-                            .getProjectOptions()
-                            .get(BooleanOption.ENABLE_GLOBAL_SYNTHETICS)
+            if (!creationConfig.getEnableGlobalSynthetics()
                     || creationConfig.getDexingCreationConfig().getDexingType()
                             != DexingType.NATIVE_MULTIDEX
                     || creationConfig.getOptimizationCreationConfig().getMinifiedEnabled()) {
diff --git a/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/cacheability/DynamicFeaturesCacheabilityTest.kt b/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/cacheability/DynamicFeaturesCacheabilityTest.kt
index e20fc582e6..7ed84fa923 100644
--- a/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/cacheability/DynamicFeaturesCacheabilityTest.kt
+++ b/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/cacheability/DynamicFeaturesCacheabilityTest.kt
@@ -99,7 +99,6 @@ class DynamicFeaturesCacheabilityTest {
                     ":feature1:javaPreCompileDebug",
                     ":feature1:lintAnalyzeDebug",
                     ":feature1:mergeDebugAssets",
-                    ":feature1:mergeDebugGlobalSynthetics",
                     ":feature1:mergeDebugJniLibFolders",
                     ":feature1:mergeDebugResources",
                     ":feature1:mergeDebugShaders",
@@ -124,7 +123,6 @@ class DynamicFeaturesCacheabilityTest {
                     ":feature2:javaPreCompileDebug",
                     ":feature2:lintAnalyzeDebug",
                     ":feature2:mergeDebugAssets",
-                    ":feature2:mergeDebugGlobalSynthetics",
                     ":feature2:mergeDebugJniLibFolders",
                     ":feature2:mergeDebugResources",
                     ":feature2:mergeDebugShaders",