Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 68df2f5

Browse files
authored
Remove obsolete instructions from scenario_app readme, pass depfile correctly. (#28732)
1 parent 2e23236 commit 68df2f5

File tree

3 files changed

+35
-64
lines changed

3 files changed

+35
-64
lines changed

build/dart/rules.gni

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,22 @@ import("//build/module_args/dart.gni")
99
import("//flutter/common/config.gni")
1010
import("//third_party/dart/build/dart/dart_action.gni")
1111

12+
frontend_server_files =
13+
exec_script("//third_party/dart/tools/list_dart_files.py",
14+
[
15+
"absolute",
16+
rebase_path("."),
17+
],
18+
"list lines")
19+
20+
frontend_server_files +=
21+
exec_script("//third_party/dart/tools/list_dart_files.py",
22+
[
23+
"absolute",
24+
rebase_path("../../third_party/dart/pkg"),
25+
],
26+
"list lines")
27+
1228
# Creates a dart kernel (dill) file suitable for use with gen_snapshot, as well
1329
# as the app-jit, aot-elf, or aot-assembly snapshot for targeting Flutter on
1430
# Android or iOS.
@@ -38,22 +54,18 @@ template("flutter_snapshot") {
3854
deps = [ "//flutter/lib/snapshot:strong_platform" ]
3955

4056
inputs = [
41-
main_dart,
42-
package_config,
43-
]
57+
main_dart,
58+
package_config,
59+
] + frontend_server_files
4460

4561
outputs = [ kernel_output ]
4662

4763
depfile = "$kernel_output.d"
4864
abs_depfile = rebase_path(depfile)
49-
rebased_output = rebase_path(kernel_output, root_build_dir)
50-
vm_args = [
51-
"--depfile=$abs_depfile",
52-
"--depfile_output_filename=$rebased_output",
53-
"--disable-dart-dev",
54-
]
65+
vm_args = [ "--disable-dart-dev" ]
5566

5667
args = [
68+
"--depfile=$abs_depfile",
5769
"--packages=" + rebase_path(package_config),
5870
"--target=flutter",
5971
"--sdk-root=" + flutter_patched_sdk,

flutter_frontend_server/BUILD.gn

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,6 @@
44

55
import("//flutter/build/dart/rules.gni")
66

7-
frontend_server_files =
8-
exec_script("//third_party/dart/tools/list_dart_files.py",
9-
[
10-
"absolute",
11-
rebase_path("."),
12-
],
13-
"list lines")
14-
15-
frontend_server_files +=
16-
exec_script("//third_party/dart/tools/list_dart_files.py",
17-
[
18-
"absolute",
19-
rebase_path("../../third_party/dart/pkg"),
20-
],
21-
"list lines")
22-
237
application_snapshot("frontend_server") {
248
main_dart = "bin/starter.dart"
259
deps = [ "//flutter/lib/snapshot:kernel_platform_files" ]

testing/scenario_app/README.md

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,17 @@ platform channel.
2121

2222
## Running for iOS
2323

24+
Build the `ios_debug_sim_unopt` engine variant, and run
25+
2426
```sh
25-
./build_and_run_ios_tests.sh
27+
./run_ios_tests.sh
2628
```
2729

30+
in your shell.
31+
32+
To run or debug in Xcode, open the xcodeproj file located in
33+
`<engine_out_dir>/scenario_app/Scenarios/Scenaios.xoceproj`.
34+
2835
### iOS Platform View Tests
2936

3037
For PlatformView tests on iOS, you'll also have to edit the dictionaries in
@@ -49,40 +56,13 @@ compared against golden reside.
4956

5057
## Running for Android
5158

52-
The test is run on a x86 emulator. To run the test locally, you must create an emulator running API level 28, using an x86_64 ABI, and set the following screen settings in the avd's `config.ini` file:
53-
54-
```
55-
hw.lcd.density = 480
56-
hw.lcd.height = 1680
57-
hw.lcd.width = 1080
58-
lcd.depth = 16
59-
```
60-
61-
This file is typically located in your `$HOME/.android/avd/<avd>` folder.
62-
63-
Once the emulator is up, you can run the test by running:
64-
65-
```bash
66-
./build_and_run_android_tests.sh
67-
```
68-
69-
### Generating Golden Images on Android
59+
The only test that is currently run is the Firebase TestLab test, which is a
60+
smoke test to make sure an application can be built and run on a real Android
61+
device.
7062

71-
In the `android` directory, run:
72-
73-
```bash
74-
../../../../gradle/bin/gradle app:recordDebugAndroidTestScreenshotTest
75-
```
76-
77-
The screenshots are recorded into `android/reports/screenshots`.
78-
79-
### Verifying Golden Images on Android
80-
81-
In the `android` directory, run:
82-
83-
```bash
84-
../../../../gradle/bin/gradle app:verifyDebugAndroidTestScreenshotTest
85-
```
63+
To run it, build the `android_profile_arm64` variant of the engine, and run
64+
`./flutter/ci/firebase_testlab.py`. If you wish to test a different variant, e.g.
65+
debug arm64, pass `--variant android_debug_arm64`.
8666

8767
### Updating Gradle dependencies
8868

@@ -94,8 +74,3 @@ To generate new lockfiles, run:
9474
cd android
9575
../../../../gradle/bin/gradle generateLockfiles
9676
```
97-
98-
## Changing dart:ui code
99-
100-
If you change the dart:ui interface, remember to point the sky_engine
101-
clauses to your local engine's output path before compiling.

0 commit comments

Comments
 (0)