Skip to content

/ webrender

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

Fix Android build #473

Merged
merged 1 commit into from Oct 25, 2016
Merged

Fix Android build #473

merged 1 commit into from Oct 25, 2016

Conversation

@mmatyas
Copy link
Contributor

mmatyas commented Oct 25, 2016 •
edited

#466 (c0b0ac0) breaks the Android build, because both unix and target_os = "android" becomes true, so you get duplicate definition errors.

(This is a fix for servo/servo#13154)

This change is Reviewable
@mmatyas
Fix Android build
Loading status checks…
679f43f
@glennw
Copy link
Member

glennw commented Oct 25, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Oct 25, 2016

📌 Commit 679f43f has been approved by glennw
@bors-servo
Copy link
Contributor

bors-servo commented Oct 25, 2016

⌛ Testing commit 679f43f with merge 9d6eb39...
bors-servo added a commit that referenced this pull request Oct 25, 2016
@bors-servo
Auto merge of #473 - mmatyas:android_hotfix, r=glennw
Loading status checks…
9d6eb39 
Fix Android build

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/473)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 25, 2016

💔 Test failed - status-travis
@mmatyas
Copy link
Contributor Author

mmatyas commented Oct 25, 2016 

/home/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/rayon-0.4.3/src/par_iter/internal.rs:96:47: 96:48 error: no rules expected the token `;`

/home/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/rayon-0.4.3/src/par_iter/internal.rs:96         thread_local!{ static ID: bool = false; }
                                                                                                                                                    ^

I guess that's not my fault?
@glennw
Copy link
Member

glennw commented Oct 25, 2016

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Oct 25, 2016

⌛ Testing commit 679f43f with merge 8caa673...
bors-servo added a commit that referenced this pull request Oct 25, 2016
@bors-servo
Auto merge of #473 - mmatyas:android_hotfix, r=glennw
Loading status checks…
8caa673 
Fix Android build

(This is a fix for servo/servo#13154)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/473)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 25, 2016

☀️ Test successful - status-travis
@bors-servo bors-servo merged commit 679f43f into servo:master Oct 25, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@mmatyas @glennw @bors-servo
You can’t perform that action at this time.