-
-
Notifications
You must be signed in to change notification settings - Fork 21.4k
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
unified headers fix (master) #12746
unified headers fix (master) #12746
Conversation
I still don't see why we need an option at all. It doesn't matter to use whether we use unified headers or not, the result is the same and we just want it to build. Having the option makes sense for very specific Android apps, but in our case it's "one size fits all" and such customization isn't relevant for game devs. Especially I'm not fond of having more code in the detect.py script for something that wouldn't be used. |
7fac5c1
to
0e89425
Compare
@akien-mga I see... I removed the option |
92fcfc9
to
30fcbdb
Compare
30fcbdb
to
7664a0f
Compare
lib_sysroot = env["ANDROID_NDK_ROOT"] + "/platforms/" + env['ndk_platform'] + "/" + env['ARCH'] | ||
|
||
## Compile flags | ||
|
||
if ndk_unified_headers: | ||
ndk_version = get_ndk_version(env["ANDROID_NDK_ROOT"]) | ||
if ndk_version != None and LooseVersion(ndk_version) >= LooseVersion("15.0.4075724"): |
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.
Well I merged too fast, this commit is incomplete. In the 2.1 one you have from distutils.version import LooseVersion
, it's missing here.
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.
@akien-mga My bad, somehow the built didn't fail alerting of the missing import. This PR has it. Sorry about that.
Enable using NDK unified headers when available and opt-out (more info)