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
Configure the Android NDK #158
Conversation
Please submit these upstream, as well. |
def stlport_cppflags(value, ndk, _): | ||
if value and len(value): | ||
- return value.split() | ||
+ return value[0].split() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this change required?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question. I made the edit to bring STLPORT_CPPFLAGS
in line with the other configurations, which use value[0]
. Building again without this change still works, so I'll undo it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, try again, I was building with the wrong version. Without this change, we get:
File "/Users/ajeffrey/.cargo/git/checkouts/mozjs-ccfd509d897f834d/f3d2e03/mozjs/build/moz.configure/android-ndk.configure", line 276, in stlport_cppflags
return value.split()
AttributeError: 'PositiveOptionValue' object has no attribute 'split'
make: *** [maybe-configure] Error 1
d204afe
to
f3d2e03
Compare
f3d2e03
to
66add25
Compare
I'll upstream these changes. @bors-servo r=jdm |
📌 Commit 66add25 has been approved by |
@bors-servo r- |
@bors-servo r=asajeffrey |
📌 Commit 66add25 has been approved by |
Configure the Android NDK This patch adds configuration for the Android NDK directory layout. It's used when building for the Magic Leap, which uses a very similar, but not quite identical, NDK. <!-- 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/158) <!-- Reviewable:end -->
💔 Test failed - status-travis |
@bors-servo retry CI weirdness. |
Configure the Android NDK This patch adds configuration for the Android NDK directory layout. It's used when building for the Magic Leap, which uses a very similar, but not quite identical, NDK. <!-- 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/158) <!-- Reviewable:end -->
☀️ Test successful - status-appveyor, status-travis |
This patch adds configuration for the Android NDK directory layout. It's used when building for the Magic Leap, which uses a very similar, but not quite identical, NDK.
This change is