Test the Android embedding v2 (#42708) * Test the Android embedding v2 * Update integration tests * Split into shards
diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart index 1a82922..4d26cb9 100644 --- a/packages/flutter_tools/lib/src/commands/create.dart +++ b/packages/flutter_tools/lib/src/commands/create.dart
@@ -623,7 +623,7 @@ 'description': projectDescription, 'dartSdk': '$flutterRoot/bin/cache/dart-sdk', 'androidX': androidX, - 'useNewAndroidEmbedding': featureFlags.isNewAndroidEmbeddingEnabled, + 'useAndroidEmbeddingV2': featureFlags.isAndroidEmbeddingV2Enabled, 'androidMinApiLevel': android.minApiLevel, 'androidSdkVersion': android_sdk.minimumAndroidSdkVersion, 'androidFlutterJar': '$flutterRoot/bin/cache/artifacts/engine/android-arm/flutter.jar',
diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart index 332506d..d3237d7 100644 --- a/packages/flutter_tools/lib/src/features.dart +++ b/packages/flutter_tools/lib/src/features.dart
@@ -36,8 +36,8 @@ /// Whether flutter desktop for Windows is enabled. bool get isWindowsEnabled => isEnabled(flutterWindowsDesktopFeature); - /// Whether the new Android embedding is enabled. - bool get isNewAndroidEmbeddingEnabled => isEnabled(flutterNewAndroidEmbeddingFeature); + /// Whether the Android embedding V2 is enabled. + bool get isAndroidEmbeddingV2Enabled => isEnabled(flutterAndroidEmbeddingV2Feature); /// Whether a particular feature is enabled for the current channel. /// @@ -71,7 +71,7 @@ flutterMacOSDesktopFeature, flutterWindowsDesktopFeature, flutterBuildPluginAsAarFeature, - flutterNewAndroidEmbeddingFeature, + flutterAndroidEmbeddingV2Feature, ]; /// The [Feature] for flutter web. @@ -133,9 +133,10 @@ ); /// The [Feature] for generating projects using the new Android embedding. -const Feature flutterNewAndroidEmbeddingFeature = Feature( - name: 'flutter create generates projects using the new Android embedding', - configSetting: 'enable-new-android-embedding', +const Feature flutterAndroidEmbeddingV2Feature = Feature( + name: 'flutter create generates projects using the Android embedding V2', + environmentOverride: 'ENABLE_ANDROID_EMBEDDING_V2', + configSetting: 'enable-android-embedding-v2', master: FeatureChannelSetting( available: true, enabledByDefault: false,
diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index a582d8d..9568e58 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart
@@ -617,7 +617,7 @@ _overwriteFromTemplate(fs.path.join( 'module', 'android', - featureFlags.isNewAndroidEmbeddingEnabled ? 'library_new_embedding' : 'library', + featureFlags.isAndroidEmbeddingV2Enabled ? 'library_new_embedding' : 'library', ), ephemeralDirectory); _overwriteFromTemplate(fs.path.join('module', 'android', 'gradle'), ephemeralDirectory); gradle.injectGradleWrapperIfNeeded(ephemeralDirectory); @@ -631,7 +631,7 @@ 'projectName': parent.manifest.appName, 'androidIdentifier': parent.manifest.androidPackage, 'androidX': usesAndroidX, - 'useNewAndroidEmbedding': featureFlags.isNewAndroidEmbeddingEnabled, + 'useAndroidEmbeddingV2': featureFlags.isAndroidEmbeddingV2Enabled, }, printStatusWhenWriting: false, overwriteExisting: true,