Bug 1435409 - use our own clang rather than the NDK clang to build Android; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Fri, 27 Jul 2018 09:52:53 -0500
changeset 483852 de5e21062a40a8f22284f2bdac9aaa8d1cf28844
parent 483851 c47ad4f17e198461cea48de023ba58b36598acb3
child 483853 35a17ebc4ee64460cdac22d3fb2a57e1215e9b0f
child 483885 036eaf559f72ab3054b2fa1699feb748cc94431d
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1435409
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1435409 - use our own clang rather than the NDK clang to build Android; r=nalexander
CLOBBER
mobile/android/config/mozconfigs/common
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # 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
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -19,16 +19,19 @@ HOST_CXX="$topsrcdir/clang/bin/clang++"
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux"
 
 ac_add_options --with-gradle="$topsrcdir/android-gradle-dependencies/gradle-dist/bin/gradle"
 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
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 ac_add_options --with-google-api-keyfile=/builds/gapi.data
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key