@@ -105,6 +105,7 @@ TaskFunction createAndroidTextureScrollPerfTest({bool? enableImpeller}) {
105105 testDriver: 'test_driver/scroll_perf_test.dart' ,
106106 needsFullTimeline: false ,
107107 enableImpeller: enableImpeller,
108+ enableMergedPlatformThread: true ,
108109 ).run;
109110}
110111
@@ -114,6 +115,7 @@ TaskFunction createAndroidViewScrollPerfTest() {
114115 'test_driver/android_view_scroll_perf.dart' ,
115116 'platform_views_scroll_perf_hybrid_composition' ,
116117 testDriver: 'test_driver/scroll_perf_test.dart' ,
118+ enableMergedPlatformThread: true ,
117119 ).run;
118120}
119121
@@ -896,6 +898,13 @@ void _addMetadataToManifest(String testDirectory, List<(String, String)> keyPair
896898 file.writeAsStringSync (xmlDoc.toXmlString (pretty: true , indent: ' ' ));
897899}
898900
901+ void _addMergedPlatformThreadSupportToManifest (String testDirectory) {
902+ final List <(String , String )> keyPairs = < (String , String )> [
903+ ('io.flutter.embedding.android.EnableMergedPlatformUIThread' , 'true' ),
904+ ];
905+ _addMetadataToManifest (testDirectory, keyPairs);
906+ }
907+
899908/// Opens the file at testDirectory + 'android/app/src/main/AndroidManifest.xml'
900909/// <meta-data
901910/// android:name="io.flutter.embedding.android.EnableVulkanGPUTracing"
@@ -1389,6 +1398,9 @@ class PerfTest {
13891398 if (forceOpenGLES ?? false ) {
13901399 _addOpenGLESToManifest (testDirectory);
13911400 }
1401+ if (enableMergedPlatformThread) {
1402+ _addMergedPlatformThreadSupportToManifest (testDirectory);
1403+ }
13921404 }
13931405 if (disablePartialRepaint || enableMergedPlatformThread) {
13941406 changedPlist = true ;
@@ -1460,7 +1472,7 @@ class PerfTest {
14601472 case DeviceOperatingSystem .android:
14611473 case DeviceOperatingSystem .androidArm:
14621474 case DeviceOperatingSystem .androidArm64:
1463- recordGPU = enableImpeller ?? false ;
1475+ recordGPU = true ;
14641476 case DeviceOperatingSystem .fake:
14651477 case DeviceOperatingSystem .fuchsia:
14661478 case DeviceOperatingSystem .linux:
0 commit comments