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

Configure the Android NDK #158

Merged
merged 4 commits into from Oct 23, 2018
Merged

Conversation

asajeffrey
Copy link
Member

@asajeffrey asajeffrey commented Oct 19, 2018

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 Reviewable

@jdm
Copy link
Member

jdm commented Oct 22, 2018

Please submit these upstream, as well.

def stlport_cppflags(value, ndk, _):
if value and len(value):
- return value.split()
+ return value[0].split()
Copy link
Member

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?

Copy link
Member Author

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.

Copy link
Member Author

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

@asajeffrey
Copy link
Member Author

I'll upstream these changes. @bors-servo r=jdm

@bors-servo
Copy link
Contributor

📌 Commit 66add25 has been approved by jdm

@jdm
Copy link
Member

jdm commented Oct 23, 2018

@bors-servo r-
Homu doesn't think that travis exists in this repo for some reason.

@jdm
Copy link
Member

jdm commented Oct 23, 2018

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

📌 Commit 66add25 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

⌛ Testing commit 66add25 with merge d1c399f...

bors-servo pushed a commit that referenced this pull request Oct 23, 2018
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 -->
@bors-servo
Copy link
Contributor

💔 Test failed - status-travis

@asajeffrey
Copy link
Member Author

@bors-servo retry CI weirdness.

@bors-servo
Copy link
Contributor

⌛ Testing commit 66add25 with merge 7f445c0...

bors-servo pushed a commit that referenced this pull request Oct 23, 2018
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 -->
@bors-servo
Copy link
Contributor

☀️ Test successful - status-appveyor, status-travis
Approved by: asajeffrey
Pushing 7f445c0 to master...

@bors-servo bors-servo merged commit 66add25 into servo:master Oct 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants