From 2c80bc973db8bfe9d4b4c04a9ccf5d9df484261a Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Thu, 7 Nov 2019 15:18:56 -0800
Subject: [PATCH] Flip enable-android-embedding-v2 flag (#44369)

---
 dev/bots/test.dart                           | 4 +---
 packages/flutter_tools/lib/src/features.dart | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev/bots/test.dart b/dev/bots/test.dart
index a8aec472362..0b3bf4863e7 100644
--- a/dev/bots/test.dart
+++ b/dev/bots/test.dart
@@ -754,10 +754,8 @@ Future<void> _runHostOnlyDeviceLabTests() async {
     () => _runDevicelabTest('gradle_plugin_light_apk_test', environment: gradleEnvironment),
     () => _runDevicelabTest('gradle_r8_test', environment: gradleEnvironment),
 
-    () => _runDevicelabTest('module_host_with_custom_build_test', environment: gradleEnvironment, testEmbeddingV2: false),
     () => _runDevicelabTest('module_host_with_custom_build_test', environment: gradleEnvironment, testEmbeddingV2: true),
-    if (!Platform.isMacOS) () => _runDevicelabTest('module_test', environment: gradleEnvironment, testEmbeddingV2: false),
-    if (!Platform.isMacOS) () => _runDevicelabTest('module_test', environment: gradleEnvironment, testEmbeddingV2: true),
+    () => _runDevicelabTest('module_test', environment: gradleEnvironment, testEmbeddingV2: true),
 
     // TODO(jmagman): Re-enable once flakiness is resolved, https://github.com/flutter/flutter/issues/37525
     // if (Platform.isMacOS) () => _runDevicelabTest('module_test_ios'),
diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart
index 5e618b26fc9..9822ac9926a 100644
--- a/packages/flutter_tools/lib/src/features.dart
+++ b/packages/flutter_tools/lib/src/features.dart
@@ -143,7 +143,7 @@ const Feature flutterAndroidEmbeddingV2Feature = Feature(
   configSetting: 'enable-android-embedding-v2',
   master: FeatureChannelSetting(
     available: true,
-    enabledByDefault: false,
+    enabledByDefault: true,
   ),
 );