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

Re-split ocmock into source set and static lib #403

Merged
merged 1 commit into from
Sep 11, 2020

Conversation

cbracken
Copy link
Member

This re-lands #399 with complete_static_lib=true in the static library
target.

static_library does not includes sources from its dependencies, and
since this target had no (direct) sources of its own, was being built
empty in the original version of this split. The complete_static_lib
forces the library to include sources from its dependencies.

This re-lands flutter#399 with complete_static_lib=true in the static library
target.

static_library does not includes sources from its dependencies, and
since this target had no (direct) sources of its own, was being built
empty in the original version of this split. The complete_static_lib
forces the library to include sources from its dependencies.
@cbracken cbracken requested a review from justinmc September 11, 2020 20:45
@cbracken
Copy link
Member Author

Context is that this is required for flutter/engine#20531, which I don't have the context on. @justinmc I'm curious why we're unable to link against the static library directly?

@justinmc
Copy link
Contributor

justinmc commented Sep 11, 2020

I was running into an error described in my comment here when I tried to do this directly. CC @gaaclarke who helped me overcome that.

With this PR, I now get a new error:

$ ninja -C out/host_debug_unopt -j 100
ninja: Entering directory `out/host_debug_unopt'
ninja: error: '../../third_party/ocmock/Source/OCMock/OCMNonRetainingObjectReturnValueProvider.m', needed by 'obj/third_party/ocmock/Source/OCMock/ocmock_src.OCMNonRetainingObjectReturnValueProvider.o', missing and no known rule to make it

@cbracken
Copy link
Member Author

For archaeologists gclient sync should fix the above.

@justinmc
Copy link
Contributor

Just confirmed that indeed gclient sync fixed it for me 👍

Copy link
Contributor

@justinmc justinmc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cbracken cbracken merged commit 236a746 into flutter:master Sep 11, 2020
@cbracken cbracken deleted the ocmock-separate-targets branch September 11, 2020 22:40
chinmaygarde pushed a commit to chinmaygarde/flutter_buildroot that referenced this pull request May 4, 2021
This re-lands flutter#399 with complete_static_lib=true in the static library
target.

static_library does not includes sources from its dependencies, and
since this target had no (direct) sources of its own, was being built
empty in the original version of this split. The complete_static_lib
forces the library to include sources from its dependencies.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants