diff --git a/build/archives/BUILD.gn b/build/archives/BUILD.gn index dd35d33fd7014..97d9483a23aba 100644 --- a/build/archives/BUILD.gn +++ b/build/archives/BUILD.gn @@ -31,7 +31,7 @@ generated_file("artifacts_entitlement_config") { # gen_snapshot_x64 are used in its place). # # Target-specific iOS artifacts.zip are produced in: -# //flutter/sky/tools/create_full_ios_framework.py +# //flutter/sky/tools/create_ios_framework.py # # Target-specific Android archives are produced in: # //flutter/shell/platform/android:gen_snapshot diff --git a/ci/builders/README.md b/ci/builders/README.md index 2b4ab977aafdb..cfcf40afaed72 100644 --- a/ci/builders/README.md +++ b/ci/builders/README.md @@ -431,7 +431,7 @@ be relative to the checkout directory. "--simulator-arm64-out-dir", "out/ios_debug_sim_arm64" ], - "script": "flutter/sky/tools/create_full_ios_framework.py", + "script": "flutter/sky/tools/create_ios_framework.py", "language": "python3" } ``` @@ -657,7 +657,11 @@ copied verbatim from the executions details of the build. The following example will run the generator to create the ios artifacts: ```bash -python3 flutter/sky/tools/create_full_ios_framework.py --dst out/release \ ---arm64-out-dir out/ios_release --simulator-x64-out-dir out/ios_debug_sim \ ---simulator-arm64-out-dir out/ios_debug_sim_arm64 --dsym --strip +python3 flutter/sky/tools/create_ios_framework.py \ + --dst out/release \ + --arm64-out-dir out/ios_release \ + --simulator-x64-out-dir out/ios_debug_sim \ + --simulator-arm64-out-dir out/ios_debug_sim_arm64 \ + --dsym \ + --strip ``` diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 7f83aa1437b3d..3efefb9dd4dc3 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -479,7 +479,7 @@ "--simulator-arm64-out-dir", "out/ci/ios_debug_sim_arm64" ], - "script": "flutter/sky/tools/create_full_ios_framework.py", + "script": "flutter/sky/tools/create_ios_framework.py", "language": "python3" }, { @@ -494,7 +494,7 @@ "--simulator-arm64-out-dir", "out/ci/ios_debug_sim_arm64" ], - "script": "flutter/sky/tools/create_full_ios_framework.py", + "script": "flutter/sky/tools/create_ios_framework.py", "language": "python3" }, { @@ -511,7 +511,7 @@ "--dsym", "--strip" ], - "script": "flutter/sky/tools/create_full_ios_framework.py", + "script": "flutter/sky/tools/create_ios_framework.py", "language": "python3" }, { diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 5d5333443dfcc..492c3a26f4332 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -429,7 +429,7 @@ ../../../flutter/sky/packages/sky_engine/lib/_embedder.yaml ../../../flutter/sky/packages/sky_engine/pubspec.yaml ../../../flutter/sky/tools/create_embedder_framework.py -../../../flutter/sky/tools/create_full_ios_framework.py +../../../flutter/sky/tools/create_ios_framework.py ../../../flutter/sky/tools/create_macos_binary.py ../../../flutter/sky/tools/create_macos_framework.py ../../../flutter/sky/tools/create_macos_gen_snapshots.py diff --git a/docs/release/Code-signing-metadata.md b/docs/release/Code-signing-metadata.md index 4efd26a13ad49..746103baf3727 100644 --- a/docs/release/Code-signing-metadata.md +++ b/docs/release/Code-signing-metadata.md @@ -148,7 +148,7 @@ You can reference the [mac_host_engine.json](https://github.com/flutter/engine/blob/main/ci/builders/mac_host_engine.json)). The generator script related to iOS is located at - `sky/tools/create_full_ios_framework.py`, and generator script related to + `sky/tools/create_ios_framework.py`, and generator script related to macOS is located at `sky/tools/create_macos_framework.py`. 2. Add / Update the variables ending with `with_entitlements` / @@ -156,7 +156,7 @@ You can reference the one. As an example, you can find variables `ios_file_without_entitlements` and - `ios_file_with_entitlements` in sky/tools/create_full_ios_framework.py; and + `ios_file_with_entitlements` in sky/tools/create_ios_framework.py; and find variables `filepath_without_entitlements` and `filepath_with_entitlements` in sky/tools/create_macos_framework.py @@ -176,7 +176,7 @@ that exist in a zip bundle called `ios/artifacts.zip`. 1. Following step 1, in [mac_ios_engine.json](https://github.com/flutter/engine/blob/main/ci/builders/mac_ios_engine.json), it builds the artifact with the - `flutter/sky/tools/create_full_ios_framework.py` script. + `flutter/sky/tools/create_ios_framework.py` script. 2. Following step 2, since `Flutter.xcframework/ios-arm64/Flutter.framework/Flutter` shouldn't be code @@ -185,7 +185,7 @@ that exist in a zip bundle called `ios/artifacts.zip`. `ios_file_without_entitlements` variable. You can reference the generator script -[create_full_ios_framework.py](https://github.com/flutter/engine/blob/main/sky/tools/create_full_ios_framework.py). +[create_ios_framework.py](https://github.com/flutter/engine/blob/main/sky/tools/create_ios_framework.py). ## Code signing artifacts other than flutter engine binaries @@ -193,4 +193,4 @@ The code signing functionality is implemented as [a recipe module in flutter rec code sign arbitrary flutter artifacts built through recipe, for example, flutter iOS usb dependencies. To code sign, after the artifacts are built, pass the file paths into -the code signing recipe module and invoke the function. An example is [how engine V2 invokes the code signing recipe module](https://cs.opensource.google/flutter/recipes/+/master:recipes/engine_v2/engine_v2.py;l=197-212). \ No newline at end of file +the code signing recipe module and invoke the function. An example is [how engine V2 invokes the code signing recipe module](https://cs.opensource.google/flutter/recipes/+/master:recipes/engine_v2/engine_v2.py;l=197-212). diff --git a/sky/tools/create_full_ios_framework.py b/sky/tools/create_ios_framework.py similarity index 100% rename from sky/tools/create_full_ios_framework.py rename to sky/tools/create_ios_framework.py