Skip to content

Commit da4d0e4

Browse files
hellohuanlinhellohuanlin
authored
Reland: "Platform view devicelab ad banner scroll list real ads" (#145224)
Reland flutter/flutter#144745, which got reverted due to Android lockfile. Fixed by `dart dev/tools/bin/generate_gradle_lockfiles.dart` *List which issues are fixed by this PR. You must list at least one issue. An issue is not required if the PR fixes something trivial like a typo.* Fixes flutter/flutter#143534 Fixes flutter/flutter#143257 *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].*
1 parent d113ee4 commit da4d0e4

19 files changed

+556
-33
lines changed

‎.ci.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4628,6 +4628,16 @@ targets:
46284628
["devicelab", "ios", "mac"]
46294629
task_name: platform_views_scroll_perf_ios__timeline_summary
46304630

4631+
- name: Mac_ios platform_views_scroll_perf_ad_banners__timeline_summary
4632+
recipe: devicelab/devicelab_drone
4633+
presubmit: false
4634+
bringup: true
4635+
timeout: 60
4636+
properties:
4637+
tags: >
4638+
["devicelab", "ios", "mac"]
4639+
task_name: platform_views_scroll_perf_ad_banners__timeline_summary
4640+
46314641
- name: Mac_ios platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary
46324642
recipe: devicelab/devicelab_drone
46334643
presubmit: false

‎TESTOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@
207207
/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @gaaclarke @flutter/engine
208208
/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart @hellohuanlin @flutter/engine
209209
/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @stuartmorgan @flutter/plugin
210+
/dev/devicelab/bin/tasks/platform_views_scroll_perf_ad_banners__timeline_summary.dart @hellohuanlin @flutter/engine
210211
/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
211212
/dev/devicelab/bin/tasks/platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary.dart @jonahwilliams @flutter/engine
212213
/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine

‎dev/benchmarks/platform_views_layout/android/project-app.lockfile

Lines changed: 76 additions & 22 deletions
Large diffs are not rendered by default.

‎dev/benchmarks/platform_views_layout/android/project-google_mobile_ads.lockfile

Lines changed: 126 additions & 0 deletions
Large diffs are not rendered by default.

‎dev/benchmarks/platform_views_layout/android/project-webview_flutter_android.lockfile

Lines changed: 53 additions & 0 deletions
Large diffs are not rendered by default.

‎dev/benchmarks/platform_views_layout/ios/Flutter/Debug.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
12
#include "Generated.xcconfig"

‎dev/benchmarks/platform_views_layout/ios/Flutter/Release.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
12
#include "Generated.xcconfig"

‎dev/benchmarks/platform_views_layout/ios/Podfile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Uncomment this line to define a global platform for your project
2+
# platform :ios, '12.0'
3+
4+
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
5+
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
6+
7+
project 'Runner', {
8+
'Debug' => :debug,
9+
'Profile' => :release,
10+
'Release' => :release,
11+
}
12+
13+
def flutter_root
14+
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
15+
unless File.exist?(generated_xcode_build_settings_path)
16+
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
17+
end
18+
19+
File.foreach(generated_xcode_build_settings_path) do |line|
20+
matches = line.match(/FLUTTER_ROOT\=(.*)/)
21+
return matches[1].strip if matches
22+
end
23+
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
24+
end
25+
26+
require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
27+
28+
flutter_ios_podfile_setup
29+
30+
target 'Runner' do
31+
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
32+
end
33+
34+
post_install do |installer|
35+
installer.pods_project.targets.each do |target|
36+
flutter_additional_ios_build_settings(target)
37+
end
38+
end

‎dev/benchmarks/platform_views_layout/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
4552BF1971CFF555ACB2839A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BD993316F35385497F75FF6C /* libPods-Runner.a */; };
1011
647B792C24207B8900ABA501 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 647B792B24207B8900ABA501 /* AppDelegate.m */; };
1112
647B792F24207D1600ABA501 /* DummyPlatformView.m in Sources */ = {isa = PBXBuildFile; fileRef = 647B792E24207D1600ABA501 /* DummyPlatformView.m */; };
1213
647B793224208A4200ABA501 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 647B793024208A4200ABA501 /* GeneratedPluginRegistrant.m */; };
@@ -31,6 +32,9 @@
3132
/* End PBXCopyFilesBuildPhase section */
3233

3334
/* Begin PBXFileReference section */
35+
0F4D3146B7B6DF07E43DC73C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
36+
3269CF3CF6F192082C33C163 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
37+
5E91F24FF1A398625C9C0FA5 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
3438
647B792824207ADD00ABA501 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
3539
647B792B24207B8900ABA501 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
3640
647B792D24207CC400ABA501 /* DummyPlatformView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DummyPlatformView.h; sourceTree = "<group>"; };
@@ -47,19 +51,39 @@
4751
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4852
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4953
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
54+
BD993316F35385497F75FF6C /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5055
/* End PBXFileReference section */
5156

5257
/* Begin PBXFrameworksBuildPhase section */
5358
97C146EB1CF9000F007C117D /* Frameworks */ = {
5459
isa = PBXFrameworksBuildPhase;
5560
buildActionMask = 2147483647;
5661
files = (
62+
4552BF1971CFF555ACB2839A /* libPods-Runner.a in Frameworks */,
5763
);
5864
runOnlyForDeploymentPostprocessing = 0;
5965
};
6066
/* End PBXFrameworksBuildPhase section */
6167

6268
/* Begin PBXGroup section */
69+
0093AEB0458530A026D4EDDD /* Frameworks */ = {
70+
isa = PBXGroup;
71+
children = (
72+
BD993316F35385497F75FF6C /* libPods-Runner.a */,
73+
);
74+
name = Frameworks;
75+
sourceTree = "<group>";
76+
};
77+
3B86C3C30DA7CC47EE4FB68E /* Pods */ = {
78+
isa = PBXGroup;
79+
children = (
80+
3269CF3CF6F192082C33C163 /* Pods-Runner.debug.xcconfig */,
81+
0F4D3146B7B6DF07E43DC73C /* Pods-Runner.release.xcconfig */,
82+
5E91F24FF1A398625C9C0FA5 /* Pods-Runner.profile.xcconfig */,
83+
);
84+
path = Pods;
85+
sourceTree = "<group>";
86+
};
6387
9740EEB11CF90186004384FC /* Flutter */ = {
6488
isa = PBXGroup;
6589
children = (
@@ -77,6 +101,8 @@
77101
9740EEB11CF90186004384FC /* Flutter */,
78102
97C146F01CF9000F007C117D /* Runner */,
79103
97C146EF1CF9000F007C117D /* Products */,
104+
3B86C3C30DA7CC47EE4FB68E /* Pods */,
105+
0093AEB0458530A026D4EDDD /* Frameworks */,
80106
);
81107
sourceTree = "<group>";
82108
};
@@ -121,12 +147,14 @@
121147
isa = PBXNativeTarget;
122148
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
123149
buildPhases = (
150+
F9890346AACD48B6C9FEE2A0 /* [CP] Check Pods Manifest.lock */,
124151
9740EEB61CF901F6004384FC /* Run Script */,
125152
97C146EA1CF9000F007C117D /* Sources */,
126153
97C146EB1CF9000F007C117D /* Frameworks */,
127154
97C146EC1CF9000F007C117D /* Resources */,
128155
9705A1C41CF9048500538489 /* Embed Frameworks */,
129156
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
157+
9A0E2E29949C30C54EBF3099 /* [CP] Copy Pods Resources */,
130158
);
131159
buildRules = (
132160
);
@@ -215,6 +243,45 @@
215243
shellPath = /bin/sh;
216244
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
217245
};
246+
9A0E2E29949C30C54EBF3099 /* [CP] Copy Pods Resources */ = {
247+
isa = PBXShellScriptBuildPhase;
248+
buildActionMask = 2147483647;
249+
files = (
250+
);
251+
inputFileListPaths = (
252+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
253+
);
254+
name = "[CP] Copy Pods Resources";
255+
outputFileListPaths = (
256+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
257+
);
258+
runOnlyForDeploymentPostprocessing = 0;
259+
shellPath = /bin/sh;
260+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
261+
showEnvVarsInLog = 0;
262+
};
263+
F9890346AACD48B6C9FEE2A0 /* [CP] Check Pods Manifest.lock */ = {
264+
isa = PBXShellScriptBuildPhase;
265+
buildActionMask = 2147483647;
266+
files = (
267+
);
268+
inputFileListPaths = (
269+
);
270+
inputPaths = (
271+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
272+
"${PODS_ROOT}/Manifest.lock",
273+
);
274+
name = "[CP] Check Pods Manifest.lock";
275+
outputFileListPaths = (
276+
);
277+
outputPaths = (
278+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
279+
);
280+
runOnlyForDeploymentPostprocessing = 0;
281+
shellPath = /bin/sh;
282+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
283+
showEnvVarsInLog = 0;
284+
};
218285
/* End PBXShellScriptBuildPhase section */
219286

220287
/* Begin PBXSourcesBuildPhase section */
@@ -307,6 +374,7 @@
307374
buildSettings = {
308375
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
309376
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
377+
DEVELOPMENT_TEAM = "";
310378
ENABLE_BITCODE = NO;
311379
INFOPLIST_FILE = Runner/Info.plist;
312380
LD_RUNPATH_SEARCH_PATHS = (
@@ -430,7 +498,7 @@
430498
buildSettings = {
431499
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
432500
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
433-
DEVELOPMENT_TEAM = S8QB4VV633;
501+
DEVELOPMENT_TEAM = "";
434502
ENABLE_BITCODE = NO;
435503
INFOPLIST_FILE = Runner/Info.plist;
436504
LD_RUNPATH_SEARCH_PATHS = (
@@ -449,6 +517,7 @@
449517
buildSettings = {
450518
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
451519
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
520+
DEVELOPMENT_TEAM = "";
452521
ENABLE_BITCODE = NO;
453522
INFOPLIST_FILE = Runner/Info.plist;
454523
LD_RUNPATH_SEARCH_PATHS = (

‎dev/benchmarks/platform_views_layout/ios/Runner.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)