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

Remove unnecessary define from android build. #21782

Closed
wants to merge 1 commit into from
Closed

Remove unnecessary define from android build. #21782

wants to merge 1 commit into from

Conversation

@jdm
Copy link
Member

jdm commented Sep 21, 2018

This regularly shows me this warning:

warning: In file included from <built-in>:1:
warning: In file included from /Users/jdm/src/servo/target/armv7-linux-androideabi/debug/build/mozjs_sys-dd0a269b31bf3a8b/out/js/src/js-confdefs.h:91:
warning: /Users/jdm/src/servo/target/armv7-linux-androideabi/debug/build/mozjs_sys-dd0a269b31bf3a8b/out/dist/include/js/RequiredDefines.h:28:9: warning: '__STDC_CONSTANT_MACROS' macro redefined [-Wmacro-redefined]
warning: #define __STDC_CONSTANT_MACROS
warning:         ^
warning: <command line>:2:9: note: previous definition is here
warning: #define __STDC_CONSTANT_MACROS 1
warning:         ^
warning: 1 warning generated.

This was added originally before we understood the need for js-confdefs.h, but wasn't removed after our understanding grew.


This change is Reviewable

@highfive
Copy link

highfive commented Sep 21, 2018

Heads up! This PR modifies the following files:

@jdm
Copy link
Member Author

jdm commented Sep 21, 2018

@highfive highfive assigned asajeffrey and unassigned SimonSapin Sep 21, 2018
@asajeffrey
Copy link
Member

asajeffrey commented Sep 21, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 21, 2018

📌 Commit 9e25897 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Sep 21, 2018

Testing commit 9e25897 with merge ea33a33...

bors-servo added a commit that referenced this pull request Sep 21, 2018
Remove unnecessary define from android build.

This regularly shows me this warning:
```
warning: In file included from <built-in>:1:
warning: In file included from /Users/jdm/src/servo/target/armv7-linux-androideabi/debug/build/mozjs_sys-dd0a269b31bf3a8b/out/js/src/js-confdefs.h:91:
warning: /Users/jdm/src/servo/target/armv7-linux-androideabi/debug/build/mozjs_sys-dd0a269b31bf3a8b/out/dist/include/js/RequiredDefines.h:28:9: warning: '__STDC_CONSTANT_MACROS' macro redefined [-Wmacro-redefined]
warning: #define __STDC_CONSTANT_MACROS
warning:         ^
warning: <command line>:2:9: note: previous definition is here
warning: #define __STDC_CONSTANT_MACROS 1
warning:         ^
warning: 1 warning generated.
```

This was added originally before we understood the need for js-confdefs.h, but wasn't removed after our understanding grew.

<!-- 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/21782)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 21, 2018

💔 Test failed - android

@jdm
Copy link
Member Author

jdm commented Sep 22, 2018

I stand corrected.

@jdm jdm closed this Sep 22, 2018
@asajeffrey
Copy link
Member

asajeffrey commented Sep 22, 2018

Oh well, it was worth a try.

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

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