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 823539 de5e21062a40a8f22284f2bdac9aaa8d1cf28844
parent 823538 c47ad4f17e198461cea48de023ba58b36598acb3
child 823540 bcb5b801eeec0a585f49f9e4e638beecdd1ee7e2
child 823553 1f871a132d96b9a1c25b0474295cd14401b0be76
child 823566 036eaf559f72ab3054b2fa1699feb748cc94431d
child 823638 35a17ebc4ee64460cdac22d3fb2a57e1215e9b0f
child 823746 2f7582aebe3096853cfb0665237a285ed6799770
child 823860 046511602a4dade7e21d8064c9edcaf2670dd8ff
push id117712
push userrwood@mozilla.com
push dateFri, 27 Jul 2018 15:10:54 +0000
reviewersnalexander
bugs1435409
milestone63.0a1
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