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

Support for Android armv7 and aarch64 target triples #118

Merged
merged 1 commit into from May 8, 2017

Conversation

@MortimerGoro
Copy link
Contributor

MortimerGoro commented May 8, 2017

See servo/servo#11921 and servo/servo#16769


This change is Reviewable


CONFIGURE_FLAGS += --target=$(TARGET) --disable-gold
ifeq (armv7-linux-androideabi,$(TARGET))
# Fix: armv7 TARGET used by rust is not the same as the TARGET needed for CXX toolchain.

This comment has been minimized.

@jdm

jdm May 8, 2017

Member

What does the Fix: prefix here mean? I first interpreted it as FIXME, but I don't think that's correct.

This comment has been minimized.

@MortimerGoro

MortimerGoro May 8, 2017

Author Contributor

It's a typo, I'll fix it

@@ -92,6 +92,8 @@ def rust_target(rust_compiler, rustc, target, cross_compiling):
# Android
('x86', 'Android'): 'i686-linux-android',
('arm', 'Android'): 'arm-linux-androideabi',
('aarch64', 'Android'): 'aarch64-linux-android',
('armv7', 'Android'): 'arm-linux-androideabi',

This comment has been minimized.

@jdm

jdm May 8, 2017

Member

The other changes in this PR will need to be submitted upstream if they're not already present.

This comment has been minimized.

@MortimerGoro

MortimerGoro May 8, 2017

Author Contributor

So the way to get these changes in this repo is first waiting for a merge in upstream and then running this? https://github.com/servo/mozjs#upgrading

This comment has been minimized.

@jdm

jdm May 8, 2017

Member

No, it's fine to merge them in here. I just want to make sure that they don't get lost as part of the next upgrade we do (which has no definite timeline, unfortunately).

@MortimerGoro MortimerGoro force-pushed the MortimerGoro:android_archs branch from 920612b to f8f12fd May 8, 2017
@MortimerGoro
Copy link
Contributor Author

MortimerGoro commented May 8, 2017

Fixed the typo. I'll submit the required changes upstream.

@jdm
Copy link
Member

jdm commented May 8, 2017

Looks good.
@bors-servo: r+

@bors-servo
Copy link
Contributor

bors-servo commented May 8, 2017

📌 Commit f8f12fd has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented May 8, 2017

Testing commit f8f12fd with merge 834ce35...

bors-servo added a commit that referenced this pull request May 8, 2017
Support for Android armv7 and aarch64 target triples

See servo/servo#11921 and servo/servo#16769

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

bors-servo commented May 8, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: jdm
Pushing 834ce35 to master...

@bors-servo bors-servo merged commit f8f12fd into servo:master May 8, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@larsbergstrom
Copy link
Contributor

larsbergstrom commented May 13, 2017

@MortimerGoro If you need a point of contact on the Firefox/Gecko side for help with Android Rust-related build changes, @froydnj may be able to help :-)

@MortimerGoro MortimerGoro mentioned this pull request May 15, 2017
3 of 5 tasks complete
bors-servo added a commit to servo/servo that referenced this pull request May 15, 2017
Update mozjs_sys

<!-- Please describe your changes on the following line: -->

See servo/mozjs#118

Required for #11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16866)
<!-- Reviewable:end -->
moz-v2v-gh pushed a commit to mozilla/gecko-dev that referenced this pull request May 16, 2017
…s); r=nox

<!-- Please describe your changes on the following line: -->

See servo/mozjs#118

Required for servo/servo#11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9bc565362b8787768db77ac458c9fb8005e14023

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 051657136a772c64ba7b67a8b418ac7bebcbec5e
aethanyc pushed a commit to aethanyc/gecko-dev that referenced this pull request May 16, 2017
…s); r=nox

<!-- Please describe your changes on the following line: -->

See servo/mozjs#118

Required for servo/servo#11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9bc565362b8787768db77ac458c9fb8005e14023
JerryShih pushed a commit to JerryShih/gecko-dev that referenced this pull request May 17, 2017
…s); r=nox

<!-- Please describe your changes on the following line: -->

See servo/mozjs#118

Required for servo/servo#11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9bc565362b8787768db77ac458c9fb8005e14023
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified-and-comments-removed that referenced this pull request Oct 1, 2019
…s); r=nox

<!-- Please describe your changes on the following line: -->

See servo/mozjs#118

Required for servo/servo#11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9bc565362b8787768db77ac458c9fb8005e14023

UltraBlame original commit: 9d7ab545518c46e61ee6317d3bb363f62588038a
gecko-dev-updater pushed a commit to marco-c/gecko-dev-comments-removed that referenced this pull request Oct 1, 2019
…s); r=nox

<!-- Please describe your changes on the following line: -->

See servo/mozjs#118

Required for servo/servo#11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9bc565362b8787768db77ac458c9fb8005e14023

UltraBlame original commit: 9d7ab545518c46e61ee6317d3bb363f62588038a
gecko-dev-updater pushed a commit to marco-c/gecko-dev-wordified that referenced this pull request Oct 1, 2019
…s); r=nox

<!-- Please describe your changes on the following line: -->

See servo/mozjs#118

Required for servo/servo#11921

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9bc565362b8787768db77ac458c9fb8005e14023

UltraBlame original commit: 9d7ab545518c46e61ee6317d3bb363f62588038a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.