forked from flutter/engine
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update android_embedding_bundle CIPD instructions (flutter#44644)
This PR updates the gradle build file for the android_embedding_bundle cipd package to fetch license information about the dependencies listed under `tools/androidx/files.json`. The README file for the android_embedding_bundle now explains how to fetch the license information and make sure it's correct in the cipd package. This PR also pulls a new version of android_embedding_dependencies that includes a `LICENSE` file. It turns out that Flutter does not re-ship anything from the embedding bundle to Flutter end-users. These dependencies are only used to create a classpath against which we build the Android embedder and in-tree tests. I've updated docs/comments to clarify that since I was initially confused about how these were used. I'm not adding a test that compares the license info fetched from maven against a checked-in golden, yet. Still thinking about the most effective way to do that in combination with the steps in the README.
- Loading branch information
Showing
9 changed files
with
88 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
Signature: 1e4a09fc0f2117b53a35ad1bb8b9a08d | ||
Signature: d8b5e1bcc7593e590ac227d01043c4a8 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
# Don't include the jars in the engine repo. | ||
build/ | ||
lib/ | ||
.gradle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,34 @@ | ||
# Updating the Embedding Dependencies | ||
|
||
The instructions in this README explain how to create a CIPD package that | ||
contains the build-time dependencies of the Android embedding of the Engine, | ||
and the dependencies of the in-tree testing framework. The Android embedder is | ||
shipped to Flutter end-users, but these build-time dependencies are not. | ||
Therefore, the license script can skip over the destination of the CIPD package | ||
in an Engine checkout at `src/third_party/android_embedding_dependencies`. | ||
Even so, the CIPD package should contain a LICENSE file, and the instructions | ||
below explain how to fetch the license information for the dependencies. | ||
|
||
## Requirements | ||
|
||
1. Gradle. If you don't have Gradle installed, you can get it on [https://gradle.org/install/#manually](https://gradle.org/install/#manually). | ||
2. [Depot tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up). | ||
1. If you have a flutter/engine checkout, then you should already have | ||
[Depot tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up) on your path. | ||
1. You should have a copy of `gradle` in a flutter/engine checkout under | ||
`src/third_party/gradle/bin/gradle`. | ||
|
||
## Steps | ||
|
||
1. Update tools/androidx/files.json. (This file includes the Maven dependencies used to build Flutter apps). | ||
2. `cd` into this directory. | ||
3. Run `./generate.sh`. | ||
1. Update `src/flutter/tools/androidx/files.json`. (This file includes the Maven | ||
dependencies used to build Flutter apps). | ||
1. `cd` into this directory: `src/flutter/tools/cipd/android_embedding_bundle`. | ||
1. Run `gradle downloadLicenses` | ||
1. Run `gradle updateDependencies` | ||
1. Examine the file `./build/reports/license/license-dependency.xml`. If it | ||
contains licenses other than "The Apache License, Version 2.0" or something | ||
very similar, STOP. Ask Hixie for adivce on how to proceed. | ||
1. Copy or move the `lib/` directory to `src/third_party/android_embedding_dependencies/`, | ||
overwriting its contents, and ensure the Android build still works. | ||
1. Run `cipd create --pkg-def cipd.yaml -tag last_updated:"$version_tag"` where | ||
`$version_tag` is the output of `date +%Y-%m-%dT%T%z`. | ||
1. Update the `DEPS` file entry for `android_embedding_dependencies` with the | ||
new tag: `last_updated:"$version_tag"`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters