Commit 30eec11e authored by Michael Klimushyn's avatar Michael Klimushyn Committed by Emmanuel Garcia

Roll back the AAR build experiment (#36966)

* Roll back the AAR build experiment

This has been breaking flutter/plugins CI for the past day.

* Remove integration tests that rely on the AAR flag
parent 106b15a3
...@@ -961,15 +961,9 @@ Future<void> _androidGradleTests(String subShard) async { ...@@ -961,15 +961,9 @@ Future<void> _androidGradleTests(String subShard) async {
if (subShard == 'gradle1') { if (subShard == 'gradle1') {
await _runDevicelabTest('gradle_plugin_light_apk_test', env: env); await _runDevicelabTest('gradle_plugin_light_apk_test', env: env);
await _runDevicelabTest('gradle_plugin_fat_apk_test', env: env); await _runDevicelabTest('gradle_plugin_fat_apk_test', env: env);
await _runDevicelabTest('gradle_jetifier_test', env: env);
await _runDevicelabTest('gradle_plugins_without_annotations_test', env: env);
await _runDevicelabTest('gradle_plugin_dependencies_test', env: env);
await _runDevicelabTest('gradle_migrate_settings_test', env: env);
} }
if (subShard == 'gradle2') { if (subShard == 'gradle2') {
await _runDevicelabTest('gradle_plugin_bundle_test', env: env); await _runDevicelabTest('gradle_plugin_bundle_test', env: env);
await _runDevicelabTest('module_test', env: env); await _runDevicelabTest('module_test', env: env);
await _runDevicelabTest('build_aar_plugin_test', env: env);
await _runDevicelabTest('build_aar_module_test', env: env);
} }
} }
...@@ -124,10 +124,6 @@ const Feature flutterBuildPluginAsAarFeature = Feature( ...@@ -124,10 +124,6 @@ const Feature flutterBuildPluginAsAarFeature = Feature(
name: 'Build plugins independently as AARs in app projects', name: 'Build plugins independently as AARs in app projects',
configSetting: 'enable-build-plugin-as-aar', configSetting: 'enable-build-plugin-as-aar',
master: FeatureChannelSetting( master: FeatureChannelSetting(
available: true,
enabledByDefault: true,
),
dev: FeatureChannelSetting(
available: true, available: true,
enabledByDefault: false, enabledByDefault: false,
), ),
......
...@@ -436,16 +436,16 @@ void main() { ...@@ -436,16 +436,16 @@ void main() {
/// Plugins as AARS /// Plugins as AARS
test('plugins built as AARs with config on master', () => testbed.run(() { test('plugins built as AARs with config on master', () => testbed.run(() {
when(mockFlutterVerion.channel).thenReturn('master'); when(mockFlutterVerion.channel).thenReturn('master');
when<bool>(mockFlutterConfig.getValue('enable-build-plugin-as-aar')).thenReturn(true); when<bool>(mockFlutterConfig.getValue('enable-build-plugin-as-aar')).thenReturn(false);
expect(featureFlags.isPluginAsAarEnabled, true); expect(featureFlags.isPluginAsAarEnabled, false);
})); }));
test('plugins built as AARs with config on dev', () => testbed.run(() { test('plugins built as AARs with config on dev', () => testbed.run(() {
when(mockFlutterVerion.channel).thenReturn('dev'); when(mockFlutterVerion.channel).thenReturn('dev');
when<bool>(mockFlutterConfig.getValue('enable-build-plugin-as-aar')).thenReturn(true); when<bool>(mockFlutterConfig.getValue('enable-build-plugin-as-aar')).thenReturn(false);
expect(featureFlags.isPluginAsAarEnabled, true); expect(featureFlags.isPluginAsAarEnabled, false);
})); }));
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment