Differential D10599

Fix include path for x86 targets
ClosedPublic
Actions

Authored by vkrause on Feb 17 2018, 9:36 AM.

Details

Reviewers
apol
Group Reviewers
Build System
Commits
R240:16844390dab7: Fix include path for x86 targets
Summary

ANDROID_TOOLCHAIN is "x86" there, while the include path we want is
"i686-linux-android". ANDROID_COMPILER_PREFIX has that value in all
cases (for ARM both are the same, so nothing changes there).

Diff Detail

Repository
R240 Extra CMake Modules
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
vkrause created this revision.Feb 17 2018, 9:36 AM
Restricted Application added projects: Frameworks, Build System. · View Herald TranscriptFeb 17 2018, 9:36 AM
Restricted Application added a subscriber: Frameworks. · View Herald Transcript
vkrause requested review of this revision.Feb 17 2018, 9:36 AM
apol accepted this revision.Feb 17 2018, 9:59 AM
apol added subscribers: dfaure, apol.

LGTM.
@dfaure was looking into this as well earlier this week, he may have feedback.

This revision is now accepted and ready to land.Feb 17 2018, 9:59 AM
vkrause added a comment.Feb 17 2018, 10:14 AM

Interesting, @dfaure, does setting a different ABI/compiler via the command line actually work for you? Here the command-line parameters are not propagated to compiler runs for configure checks, so they run with the defaults from the toolchain file, which fails at best and ends up with a bizarre ABI mix at worst. I need to edit the corresponding fields in the toolchain file to make this work, no idea how to fix that properly yet.

Closed by commit R240:16844390dab7: Fix include path for x86 targets (authored by vkrause). · Explain WhyFeb 17 2018, 11:25 AM
This revision was automatically updated to reflect the committed changes.
dfaure added a comment.Feb 19 2018, 8:34 AM

True I've been editing the toolchain file too, probably for the same reason...

dfaure added a comment.Feb 19 2018, 8:35 AM

(btw what I did earlier this week was to introduce ANDROID_COMPILER_PREFIX in the first place, also for an x86 build...)

Revision Contents
Changeset List

PathPackages
Mtoolchain/Android.cmake (2 lines)

Diff 27396

View Options

toolchain/Android.cmake

Loading...