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

Fixes BUILD.gn if is_fuchsia (legacy embedder) and is_debug #25858

Merged
merged 1 commit into from
May 7, 2021

Conversation

richkadel
Copy link
Contributor

@richkadel richkadel commented Apr 30, 2021

Current recommended build methods may not trigger this issue, but
while trying different options, building flutter for the first time, I
noticed a build error because defines was assigned twice.

If building with both options is ever supported, I think this
fixes the error.

Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.

List which issues are fixed by this PR. You must list at least one issue.

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

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 Hixie said 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.
  • The reviewer has submitted any presubmit flakes in this PR using the engine presubmit flakes form before re-triggering the failure.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@google-cla google-cla bot added the cla: yes label Apr 30, 2021
@richkadel
Copy link
Contributor Author

@arbreng - This is a small, probably unimportant change, but a good one for me to familiarize myself with the flutter github workflow.

Are test failures like this (in the Linux Android AOT Engine) common?

File '/b/s/w/ir/cache/builder/src/flutter/testing/scenario_app/android/app/build/outputs/apk/debug/app-debug.apk' not found.

What's the best practice for resolving?

Referencing an issue:

What's the best practice if there is no existing issue, for a (trivial?) change like this? I see https://github.com/flutter/flutter/wiki/Issue-hygiene#file-bugs-for-everything . Is that practice used religiously or best judgement?

Adding a test:

I don't think this is testable since unopt is currently not possible (AFAICT)

@arbreng
Copy link
Contributor

arbreng commented Apr 30, 2021

Are test failures like this (in the Linux Android AOT Engine) common?

Did you rebase your change onto master before pushing it? this may be a consequence of your change being based on an old commit.

@richkadel
Copy link
Contributor Author

richkadel commented Apr 30, 2021 via email

@richkadel richkadel force-pushed the fix_build_defines branch from 30d3307 to d332ec1 Compare May 5, 2021 17:45
@chinmaygarde
Copy link
Member

Presubmit failures are currently blocked on a P0. Adding the CQ label.

@chinmaygarde chinmaygarde added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label May 6, 2021
@fluttergithubbot
Copy link
Contributor

This pull request is not suitable for automatic merging in its current state.

  • The status or check suite Windows Android AOT Engine has failed. Please fix the issues identified (or deflake) before re-applying this label.
  • The status or check suite Windows Host Engine has failed. Please fix the issues identified (or deflake) before re-applying this label.
  • The status or check suite Windows UWP Engine has failed. Please fix the issues identified (or deflake) before re-applying this label.

@fluttergithubbot fluttergithubbot removed the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label May 6, 2021
Current recommended build methods may not trigger this issue, but
while trying different options, building flutter for the first time, I
noticed a build error because `defines` was assigned twice.

If building with both options is ever supported, I think this
fixes the error.
@richkadel richkadel force-pushed the fix_build_defines branch from d332ec1 to 6960bd1 Compare May 7, 2021 17:03
@arbreng arbreng merged commit 0b4bf7e into flutter:master May 7, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 7, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 8, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 9, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 9, 2021
zanderso pushed a commit to flutter/flutter that referenced this pull request May 9, 2021
* ccaae8d Roll Skia from 537293bf155f to adadb95a9f1e (1 revision) (flutter/engine#25905)

* 2e3a7f8 Roll buildroot to pick change to cppwinrt invocation (flutter/engine#25993)

* 1c22286 [Linux] revise dark theme detection (flutter/engine#25535)

* 7424400 Moved PlatformMessage's to unique_ptrs (flutter/engine#25860)

* 406c4da Ensure that AutoIsolateShutdown drops its reference to the DartIsolate on the intended task runner (flutter/engine#25899)

* 72c2fda [web] Fix incorrect physical size due to visualviewport api on iOS (flutter/engine#25895)

* a712ffe Roll Dart SDK from b8f4018535fa to 86c749398b3a (16 revisions) (flutter/engine#25999)

* edbbb12 Roll Fuchsia Mac SDK from uQgs5ZmFq... to aCsEHpnS0... (flutter/engine#26001)

* afbbeac Implement smooth resizing for Linux (flutter/engine#25884)

* 3ffb8ef Roll Dart SDK from 86c749398b3a to b4210cc43086 (2 revisions) (flutter/engine#26006)

* 039dcd9 pull googletest from github instead of fuchsia.googlesource (flutter/engine#25907)

* 9c793f1 Roll Skia from adadb95a9f1e to 1dc2d0fe0fa0 (98 revisions) (flutter/engine#26009)

* 82efb9a Roll Skia from 1dc2d0fe0fa0 to 115645ee9b1b (2 revisions) (flutter/engine#26012)

* 91a4c72 Delete unused method from engine_layer.h (flutter/engine#25924)

* 619f82f fuchsia: Fix multi-views fallout (flutter/engine#25984)

* 0b4bf7e Fixes BUILD.gn if is_fuchsia (legacy embedder) and is_debug (flutter/engine#25858)

* 2e9de09 Streamline frame timings recording (flutter/engine#25892)

* 1077da8 [vsync_waiter] add AwaitVSyncForSecondaryCallback() (flutter/engine#25787)

* 0053bef [build_fuchsia_artifacts] Move license copying into BuildBucket(). (flutter/engine#25815)

* e8b80e7 Roll Skia from 115645ee9b1b to c411429239e9 (7 revisions) (flutter/engine#26018)

* d3353b2 Move more parts to libraries. (flutter/engine#25863)

* d1a1182 Roll Dart SDK from b4210cc43086 to 04e55dad908d (2 revisions) (flutter/engine#26020)

* f631f5b Exclude third_party/dart/third_party/devtools from the license script (flutter/engine#25918)

* 304539b Roll Fuchsia Mac SDK from aCsEHpnS0... to OyXxehV6e... (flutter/engine#26022)

* c3e28ae Roll Fuchsia Linux SDK from 4numS0K6T... to -FIIsjZj2... (flutter/engine#26023)

* 6cacb53 Roll Skia from c411429239e9 to 72de83df3a03 (1 revision) (flutter/engine#26024)

* bfccba5 Add dependency on Windows SDK CIPD package (flutter/engine#26003)

* 06cbf1e Roll Dart SDK from 04e55dad908d to 094c9024373c (1 revision) (flutter/engine#26027)

* 73aaeea Roll Skia from 72de83df3a03 to dabb2891c4a1 (4 revisions) (flutter/engine#26025)

* e229649 Extract Windows string_conversion target (flutter/engine#26029)

* 3d73e06 Extract FML command_line target (flutter/engine#26028)

* 4aace54 Make SceneBuilder.push* not return nullable objects (flutter/engine#25991)

* 0d62a56 Roll Dart SDK from 094c9024373c to 2ea89ef8f6de (1 revision) (flutter/engine#26030)

* 5a26c1f Use string_view inputs for conversion functions (flutter/engine#26031)

* 4f28de4 Support windows registry access (flutter/engine#26032)

* 234fae1 Roll Fuchsia Linux SDK from -FIIsjZj2... to KZCe5FqMb... (flutter/engine#26034)

* 7a47d3b Roll Fuchsia Mac SDK from OyXxehV6e... to DSk0IzBHv... (flutter/engine#26035)

* 01f9bd8 Roll Skia from dabb2891c4a1 to 686dd910dd6c (1 revision) (flutter/engine#26036)

* 1825bef Revert Dart SDK to b8f4018535fa792891e2add3a475f35e3ec156ab (flutter/engine#26037)
naudzghebre pushed a commit to naudzghebre/engine that referenced this pull request May 21, 2021
…25858)

Current recommended build methods may not trigger this issue, but
while trying different options, building flutter for the first time, I
noticed a build error because `defines` was assigned twice.

If building with both options is ever supported, I think this
fixes the error.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants