Bug 1540443 - Part 2: Split google api key file for safebrowsing and geolocation in suite build files. r=IanN a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 06 Apr 2019 16:35:09 +0200
changeset 32158 9732387a6863dbd68d4f6df32d65a807d6f232a2
parent 32157 fc445ec9ed223e73d8aca608ffe35378c803f8a0
child 32159 ddba50d16f86d1ddb2c81a1090b83c7edb7f05e6
push id181
push userfrgrahl@gmx.net
push dateSat, 06 Apr 2019 14:36:08 +0000
treeherdercomm-esr60@9732387a6863 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs1540443
Bug 1540443 - Part 2: Split google api key file for safebrowsing and geolocation in suite build files. r=IanN a=IanN
suite/config/mozconfigs/mozconfig.linux.common
suite/config/mozconfigs/mozconfig.macosx.common
suite/config/mozconfigs/mozconfig.win.common
--- a/suite/config/mozconfigs/mozconfig.linux.common
+++ b/suite/config/mozconfigs/mozconfig.linux.common
@@ -1,13 +1,14 @@
 # Common statements that are applicable to both Linux32 and Linux64.
 
 # Due to bug 1426785, we need to re-include mozconfig.gtk with our
 # linux* builders.
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.gtk
 
 export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 
-ac_add_options --with-google-api-keyfile=/builds/google-api.key
+ac_add_options --with-google-location-service-api-keyfile=/builds/google-api.key
+ac_add_options --with-google-safebrowsing-api-keyfile=/builds/google-api.key
 
 # SeaMonkey uses the google api key for Geolocation services
 # See Bug 1352850 - Switch to Google for Geolocation services
 # ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
--- a/suite/config/mozconfigs/mozconfig.macosx.common
+++ b/suite/config/mozconfigs/mozconfig.macosx.common
@@ -1,9 +1,10 @@
 # Common statements that are applicable to macOS x64.
 
 # Same location as on Linux so no need to distingush when doing
 # a macOS cross compile on Linux.
-ac_add_options --with-google-api-keyfile=/builds/google-api.key
+ac_add_options --with-google-location-service-api-keyfile=/builds/google-api.key
+ac_add_options --with-google-safebrowsing-api-keyfile=/builds/google-api.key
 
 # SeaMonkey uses the google api key for Geolocation services.
 # See Bug 1352850 - Switch to Google for Geolocation services.
 # ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-desktop-geoloc-api.key
--- a/suite/config/mozconfigs/mozconfig.win.common
+++ b/suite/config/mozconfigs/mozconfig.win.common
@@ -1,7 +1,8 @@
 # Common statements that are applicable to Windows x86 and x64.
 
-ac_add_options --with-google-api-keyfile=c:/builds/google-api.key
+ac_add_options --with-google-location-service-api-keyfile=/builds/google-api.key
+ac_add_options --with-google-safebrowsing-api-keyfile=/builds/google-api.key
 
 # SeaMonkey uses the google api key for Geolocation services
 # See Bug 1352850 - Switch to Google for Geolocation services
 # ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key