Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize darwin for shared ios/macOS #9255

Merged

Conversation

stuartmorgan
Copy link
Contributor

When the macOS framework was initially landed, it included some iOS code
using a localized hack. This reorganizes the code structure to clearly
indicate which files are shared between iOS and macOS, vs. those that
are platform-specific.

When the macOS framework was initially landed, it included some iOS code
using a localized hack. This reorganizes the code structure to clearly
indicate which files are shared between iOS and macOS, vs. those that
are platform-specific.
@stuartmorgan stuartmorgan force-pushed the darwin-framework-share-reorg branch from 514387f to d569c91 Compare June 10, 2019 18:31
@cbracken
Copy link
Member

@stuartmorgan is this ready to land?

@stuartmorgan stuartmorgan merged commit e00ac47 into flutter:master Jun 17, 2019
@stuartmorgan stuartmorgan deleted the darwin-framework-share-reorg branch June 17, 2019 18:24
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 18, 2019
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request Jun 18, 2019
flutter/engine@20d3861...05c034e

git log 20d3861..05c034e --no-merges --oneline
05c034e Update component manifests for ambient replace-as-executable (flutter/engine#9350)
66022ce Roll src/third_party/skia 55091020435c..4b203ad7ac02 (6 commits) (flutter/engine#9352)
fcff2d6 Use the DartServiceIsolate status callback to publish the observatory URI to the Android embedder (flutter/engine#9337)
ea7ca98 Send the isolate service ID from the engine to the embedder (flutter/engine#9324)
675033f Check for invalid indexes when performing InputAdpator backspace. (flutter/engine#9322)
e5918d1 Roll src/third_party/skia 92b81e14d9c2..55091020435c (6 commits) (flutter/engine#9348)
e00ac47 Reorganize darwin for shared ios/macOS (flutter/engine#9255)
9da409c Fix crash on Huawei device with AndroidView (flutter/engine#9192)
a0f8554 Removed an unused class definition for iOS code. (flutter/engine#9346)
96a1a84 Replace lock_guard with scoped_lock and use class template argument deduction. (flutter/engine#9338)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff ([email protected]), and stop
the roller if necessary.
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 19, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 19, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 19, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 19, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 19, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 19, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 19, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 19, 2019
@dnfield
Copy link
Contributor

dnfield commented Jul 11, 2019

This appeared to break our doc generation for iOS

@dnfield
Copy link
Contributor

dnfield commented Jul 11, 2019

By break, I mean our docs no longer include the classes in files that got moved here.

@stuartmorgan
Copy link
Contributor Author

I didn't realize there was automated document generation being pointed at this code. Could you file a bug, ideally with a pointer to the code that's generating it, and assign to me?

@dnfield dnfield mentioned this pull request Jul 11, 2019
@dnfield
Copy link
Contributor

dnfield commented Jul 11, 2019

See #9772 - which restores the old behavior. It also adds a test of sorts that sanity checks the class output.

johnsonmh pushed a commit to johnsonmh/flutter that referenced this pull request Jul 30, 2019
flutter/engine@20d3861...05c034e

git log 20d3861..05c034e --no-merges --oneline
05c034e Update component manifests for ambient replace-as-executable (flutter/engine#9350)
66022ce Roll src/third_party/skia 55091020435c..4b203ad7ac02 (6 commits) (flutter/engine#9352)
fcff2d6 Use the DartServiceIsolate status callback to publish the observatory URI to the Android embedder (flutter/engine#9337)
ea7ca98 Send the isolate service ID from the engine to the embedder (flutter/engine#9324)
675033f Check for invalid indexes when performing InputAdpator backspace. (flutter/engine#9322)
e5918d1 Roll src/third_party/skia 92b81e14d9c2..55091020435c (6 commits) (flutter/engine#9348)
e00ac47 Reorganize darwin for shared ios/macOS (flutter/engine#9255)
9da409c Fix crash on Huawei device with AndroidView (flutter/engine#9192)
a0f8554 Removed an unused class definition for iOS code. (flutter/engine#9346)
96a1a84 Replace lock_guard with scoped_lock and use class template argument deduction. (flutter/engine#9338)

The AutoRoll server is located here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff ([email protected]), and stop
the roller if necessary.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants