diff --git a/common/settings.h b/common/settings.h index b2872abdcd33b..ef3de3d0b595a 100644 --- a/common/settings.h +++ b/common/settings.h @@ -223,7 +223,7 @@ struct Settings { // Enable the Impeller renderer on supported platforms. Ignored if Impeller is // not supported on the platform. -#if FML_OS_IOS || FML_OS_IOS_SIMULATOR +#if FML_OS_IOS || FML_OS_IOS_SIMULATOR || FML_OS_ANDROID bool enable_impeller = true; #else bool enable_impeller = false; diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java index 36a40d3923295..54657e9949a0e 100644 --- a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java +++ b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java @@ -45,7 +45,7 @@ public class FlutterShellArgs { public static final String ARG_KEY_TRACE_TO_FILE = "trace-to-file"; public static final String ARG_TRACE_TO_FILE = "--trace-to-file"; public static final String ARG_KEY_ENABLE_IMPELLER = "enable-impeller"; - public static final String ARG_ENABLE_IMPELLER = "--enable-impeller"; + public static final String ARG_DISABLE_IMPELLER = "--enable-impeller=false"; public static final String ARG_KEY_ENABLE_VULKAN_VALIDATION = "enable-vulkan-validation"; public static final String ARG_ENABLE_VULKAN_VALIDATION = "--enable-vulkan-validation"; public static final String ARG_KEY_DUMP_SHADER_SKP_ON_SHADER_COMPILATION = @@ -123,8 +123,8 @@ public static FlutterShellArgs fromIntent(@NonNull Intent intent) { if (intent.hasExtra(ARG_KEY_TRACE_TO_FILE)) { args.add(ARG_TRACE_TO_FILE + "=" + intent.getStringExtra(ARG_KEY_TRACE_TO_FILE)); } - if (intent.getBooleanExtra(ARG_KEY_ENABLE_IMPELLER, false)) { - args.add(ARG_ENABLE_IMPELLER); + if (!intent.getBooleanExtra(ARG_KEY_ENABLE_IMPELLER, true)) { + args.add(ARG_DISABLE_IMPELLER); } if (intent.getBooleanExtra(ARG_KEY_ENABLE_VULKAN_VALIDATION, false)) { args.add(ARG_ENABLE_VULKAN_VALIDATION); diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java index 1bf2781123255..dccd0864a50d9 100644 --- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java +++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java @@ -23,6 +23,8 @@ public void onCreate(@Nullable Bundle arguments) { "--enable-impeller=true", "--impeller-backend=" + arguments.getString("impeller-backend", "vulkan") }; + } else { + engineArguments = new String[]{"--enable-impeller=false"}; } FlutterRenderer.debugDisableSurfaceClear = true; if ("true".equals(arguments.getString("force-surface-producer-surface-texture"))) { diff --git a/testing/scenario_app/bin/run_android_tests.dart b/testing/scenario_app/bin/run_android_tests.dart index 51635d9fbe629..75982fdc1b183 100644 --- a/testing/scenario_app/bin/run_android_tests.dart +++ b/testing/scenario_app/bin/run_android_tests.dart @@ -417,7 +417,9 @@ Future _run({ if (smokeTestFullPath != null) '-e class $smokeTestFullPath', if (enableImpeller) - '-e enable-impeller true', + '-e enable-impeller true' + else + '-e enable-impeller false', if (impellerBackend != null) '-e impeller-backend ${impellerBackend.name}', if (forceSurfaceProducerSurfaceTexture)