Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1435409 - use our own clang rather than the NDK clang to build Android; r=nalexander

Browse Source
This commit is contained in:
Nathan Froyd 2018-07-27 09:52:53 -05:00
parent 6ae83a4406
commit 501b992f9a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 1474414 - Moving Activity Stream out of system-addon requires a clobber.
Bug 1435409 - move Android to a non-NDK clang

3
mobile/android/config/mozconfigs/common
View File

@ -24,6 +24,9 @@ ac_add_options --with-gradle="$topsrcdir/android-gradle-dependencies/gradle-dist
export GRADLE_MAVEN_REPOSITORIES="file://$topsrcdir/android-gradle-dependencies/jcenter","file://$topsrcdir/android-gradle-dependencies/google"
if [ -z "$NO_NDK" ]; then
# We use our own clang instead of the NDK's clang.
CC="$topsrcdir/clang/bin/clang"
CXX="$topsrcdir/clang/bin/clang++"
ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
fi