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

[deps] Stop moving NDK folder inside Android SDK #47454

Merged
merged 2 commits into from
Oct 30, 2023
Merged

[deps] Stop moving NDK folder inside Android SDK #47454

merged 2 commits into from
Oct 30, 2023

Conversation

@dcharkes
Copy link
Contributor

@dcharkes dcharkes commented Oct 30, 2023 •
edited
Loading

One step in the direction of addressing

Old structure:

  • sdk/
  • ndk/

New structure

  • sdk/ndk/22.xxxx/

This PR does not yet update any of the DEPS anywhere yet, so we will need to do that after uploading new packages.

Edit: new CIPD packages uploaded with: ~/flt/engine/src/flutter/tools/android_sdk$ ./create_cipd_packages.sh 33v6transitional2 and 34v3transitional (The script does now allow underscores in the tag.)

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

@dcharkes dcharkes requested a review from godofredoc October 30, 2023 11:14
@dcharkes dcharkes mentioned this pull request Oct 30, 2023
Open
@zanderso zanderso requested a review from reidbaker October 30, 2023 15:01
@reidbaker
Copy link
Contributor

reidbaker commented Oct 30, 2023

@dcharkes go/flutter-luci-cipd that link is for googlers and should tell you how to get access to upload dependencies to CIPD.

@dcharkes dcharkes added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 30, 2023
@auto-submit auto-submit bot merged commit 5f246be into main Oct 30, 2023
@auto-submit auto-submit bot deleted the android-cipd-packages branch October 30, 2023 19:07
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 30, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 30, 2023
@engine-flutter-autoroll
5f246be25 [deps] Stop moving NDK folder inside Android SDK (flutter/e…
938c9b3 
…ngine#47454)
gaaclarke pushed a commit to flutter/flutter that referenced this pull request Oct 30, 2023
@engine-flutter-autoroll
Manual roll Flutter Engine from 84dcb4fb9301 to 4f87c20b3c34 (24 revi…
149459d 
…sions) (#137570)

Manual roll requested by [email protected]

flutter/engine@84dcb4f...4f87c20

2023-10-30 [email protected] Roll Dart SDK from
5a666e8d8259 to 85e149f894df (6 revisions) (flutter/engine#47470)
2023-10-30 [email protected] [deps] Stop moving NDK folder inside
Android SDK (flutter/engine#47454)
2023-10-30 [email protected] Revert "[Impeller] remove image
upload workarounds." (flutter/engine#47402)
2023-10-30 [email protected] Roll Skia from 89250a0bd6bb to
817fca468240 (3 revisions) (flutter/engine#47465)
2023-10-30 [email protected] Roll Skia from 006424658682 to
89250a0bd6bb (3 revisions) (flutter/engine#47463)
2023-10-30 [email protected] Migrate inja, sqlite, libtess2 to
//flutter/third_party. (flutter/engine#47408)
2023-10-30 [email protected] Revert "Roll Dart SDK from
5a666e8d8259 to 38e8459ca2aa (4 revisions)" (flutter/engine#47459)
2023-10-30 [email protected] Roll Skia from 09818d8c9d3c to
006424658682 (1 revision) (flutter/engine#47458)
2023-10-30 [email protected] Roll Skia from 6e9cd1b79105 to
09818d8c9d3c (1 revision) (flutter/engine#47456)
2023-10-30 [email protected] Remove call to
SkTypeface::MakeDefault (flutter/engine#47344)
2023-10-30 [email protected] Roll Fuchsia Linux SDK from
LbIVijDVwcB56_wgv... to zf2xLsbeoVrbnEDiH... (flutter/engine#47452)
2023-10-30 [email protected] Roll Skia from c732ec7f5d74 to
6e9cd1b79105 (2 revisions) (flutter/engine#47451)
2023-10-30 [email protected] Roll Skia from e45946f89a8b to
c732ec7f5d74 (2 revisions) (flutter/engine#47448)
2023-10-30 [email protected] Roll Fuchsia Mac SDK from
OJfJYAvhpAkE-kvbY... to jCjz-imbNBDjiRVa1... (flutter/engine#47447)
2023-10-30 [email protected] Roll Skia from 7545d1468268 to
e45946f89a8b (1 revision) (flutter/engine#47446)
2023-10-29 [email protected] Roll Skia from e224e1dc5e2c to
7545d1468268 (1 revision) (flutter/engine#47444)
2023-10-29 [email protected] Roll Fuchsia Linux SDK from
v-9_Di17lm_C_mrpZ... to LbIVijDVwcB56_wgv... (flutter/engine#47443)
2023-10-29 [email protected] Roll Fuchsia Mac SDK from
s0pbwY5MGxyq0tNrT... to OJfJYAvhpAkE-kvbY... (flutter/engine#47439)
2023-10-29 [email protected] Roll Skia from d29cc3fe182f to
e224e1dc5e2c (1 revision) (flutter/engine#47438)
2023-10-29 [email protected] Roll Fuchsia Linux SDK from
nreLekedxzmcdb3ww... to v-9_Di17lm_C_mrpZ... (flutter/engine#47436)
2023-10-29 [email protected] Roll Fuchsia Mac SDK from
qiHQ7aarDQb_1Rq3G... to s0pbwY5MGxyq0tNrT... (flutter/engine#47431)
2023-10-28 [email protected] Roll Fuchsia Linux SDK from
ESkamdoXWIwkdWdP-... to nreLekedxzmcdb3ww... (flutter/engine#47429)
2023-10-28 [email protected] Roll Fuchsia Mac SDK from
9YSl2rN0sj5YpYNdQ... to qiHQ7aarDQb_1Rq3G... (flutter/engine#47428)
2023-10-28 [email protected] Roll Dart SDK from
5a666e8d8259 to 38e8459ca2aa (4 revisions) (flutter/engine#47426)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from ESkamdoXWIwk to zf2xLsbeoVrb
  fuchsia/sdk/core/mac-amd64 from 9YSl2rN0sj5Y to jCjz-imbNBDj

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the
revert to ensure that a human
is aware of the problem.

To file a bug in Flutter:
https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
ksokolovskyi pushed a commit to ksokolovskyi/flutter that referenced this pull request Oct 31, 2023
@engine-flutter-autoroll @ksokolovskyi
Manual roll Flutter Engine from 84dcb4fb9301 to 4f87c20b3c34 (24 revi…
2f1d43a 
…sions) (flutter#137570)

Manual roll requested by [email protected]

flutter/engine@84dcb4f...4f87c20

2023-10-30 [email protected] Roll Dart SDK from
5a666e8d8259 to 85e149f894df (6 revisions) (flutter/engine#47470)
2023-10-30 [email protected] [deps] Stop moving NDK folder inside
Android SDK (flutter/engine#47454)
2023-10-30 [email protected] Revert "[Impeller] remove image
upload workarounds." (flutter/engine#47402)
2023-10-30 [email protected] Roll Skia from 89250a0bd6bb to
817fca468240 (3 revisions) (flutter/engine#47465)
2023-10-30 [email protected] Roll Skia from 006424658682 to
89250a0bd6bb (3 revisions) (flutter/engine#47463)
2023-10-30 [email protected] Migrate inja, sqlite, libtess2 to
//flutter/third_party. (flutter/engine#47408)
2023-10-30 [email protected] Revert "Roll Dart SDK from
5a666e8d8259 to 38e8459ca2aa (4 revisions)" (flutter/engine#47459)
2023-10-30 [email protected] Roll Skia from 09818d8c9d3c to
006424658682 (1 revision) (flutter/engine#47458)
2023-10-30 [email protected] Roll Skia from 6e9cd1b79105 to
09818d8c9d3c (1 revision) (flutter/engine#47456)
2023-10-30 [email protected] Remove call to
SkTypeface::MakeDefault (flutter/engine#47344)
2023-10-30 [email protected] Roll Fuchsia Linux SDK from
LbIVijDVwcB56_wgv... to zf2xLsbeoVrbnEDiH... (flutter/engine#47452)
2023-10-30 [email protected] Roll Skia from c732ec7f5d74 to
6e9cd1b79105 (2 revisions) (flutter/engine#47451)
2023-10-30 [email protected] Roll Skia from e45946f89a8b to
c732ec7f5d74 (2 revisions) (flutter/engine#47448)
2023-10-30 [email protected] Roll Fuchsia Mac SDK from
OJfJYAvhpAkE-kvbY... to jCjz-imbNBDjiRVa1... (flutter/engine#47447)
2023-10-30 [email protected] Roll Skia from 7545d1468268 to
e45946f89a8b (1 revision) (flutter/engine#47446)
2023-10-29 [email protected] Roll Skia from e224e1dc5e2c to
7545d1468268 (1 revision) (flutter/engine#47444)
2023-10-29 [email protected] Roll Fuchsia Linux SDK from
v-9_Di17lm_C_mrpZ... to LbIVijDVwcB56_wgv... (flutter/engine#47443)
2023-10-29 [email protected] Roll Fuchsia Mac SDK from
s0pbwY5MGxyq0tNrT... to OJfJYAvhpAkE-kvbY... (flutter/engine#47439)
2023-10-29 [email protected] Roll Skia from d29cc3fe182f to
e224e1dc5e2c (1 revision) (flutter/engine#47438)
2023-10-29 [email protected] Roll Fuchsia Linux SDK from
nreLekedxzmcdb3ww... to v-9_Di17lm_C_mrpZ... (flutter/engine#47436)
2023-10-29 [email protected] Roll Fuchsia Mac SDK from
qiHQ7aarDQb_1Rq3G... to s0pbwY5MGxyq0tNrT... (flutter/engine#47431)
2023-10-28 [email protected] Roll Fuchsia Linux SDK from
ESkamdoXWIwkdWdP-... to nreLekedxzmcdb3ww... (flutter/engine#47429)
2023-10-28 [email protected] Roll Fuchsia Mac SDK from
9YSl2rN0sj5YpYNdQ... to qiHQ7aarDQb_1Rq3G... (flutter/engine#47428)
2023-10-28 [email protected] Roll Dart SDK from
5a666e8d8259 to 38e8459ca2aa (4 revisions) (flutter/engine#47426)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from ESkamdoXWIwk to zf2xLsbeoVrb
  fuchsia/sdk/core/mac-amd64 from 9YSl2rN0sj5Y to jCjz-imbNBDj

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the
revert to ensure that a human
is aware of the problem.

To file a bug in Flutter:
https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
dcharkes added a commit that referenced this pull request Nov 10, 2023
@dcharkes
Revert "[deps] Stop moving NDK folder inside Android SDK (#47454)"
27d1eca 
This reverts commit 5f246be.
@dcharkes dcharkes mentioned this pull request Nov 10, 2023
Merged
8 tasks
auto-submit bot pushed a commit that referenced this pull request Nov 13, 2023
@dcharkes
Revert "[deps] Stop moving NDK folder inside Android SDK (#47454)" (#…
5d62f1a 
…47905)

Reverts

* #47454

and adds documentation

The NDK folder shuffling in the DEPS is to simplify the build files and enable building with different NDK versions between Dart and Flutter while sharing the build files.

Closes: flutter/flutter#136666

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@reidbaker reidbaker reidbaker approved these changes

@godofredoc godofredoc godofredoc approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dcharkes @reidbaker @godofredoc