Bug 1333516 - Fix windows path for API keys after bug 1294585. r?gps draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 25 Jan 2017 06:48:20 +0900
changeset 465804 cec46aaaa19abd40a4b2d7bf0e8b535f3654c098
parent 465552 6e8688fa4edb7963dcd2f9d4997cafa4db9c525a
child 543263 0b2fe398d7cf045d3ef08d54addedac51de6057d
push id42725
push userbmo:mh+mozilla@glandium.org
push dateTue, 24 Jan 2017 22:05:06 +0000
reviewersgps
bugs1333516, 1294585
milestone54.0a1
Bug 1333516 - Fix windows path for API keys after bug 1294585. r?gps
browser/config/mozconfigs/win32/common-opt
browser/config/mozconfigs/win64/common-opt
--- a/browser/config/mozconfigs/win32/common-opt
+++ b/browser/config/mozconfigs/win32/common-opt
@@ -1,23 +1,23 @@
 # This file is sourced by the nightly, beta, and release mozconfigs.
 
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 
 if [ -f /c/builds/gapi.data ]; then
-  _gapi_keyfile=/c/builds/gapi.data
+  _gapi_keyfile=c:/builds/gapi.data
 else
-  _gapi_keyfile=/e/builds/gapi.data
+  _gapi_keyfile=e:/builds/gapi.data
 fi
 ac_add_options --with-google-api-keyfile=${_gapi_keyfile}
 
-ac_add_options --with-mozilla-api-keyfile=/c/builds/mozilla-desktop-geoloc-api.key
+ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 
--- a/browser/config/mozconfigs/win64/common-opt
+++ b/browser/config/mozconfigs/win64/common-opt
@@ -1,22 +1,22 @@
 # This file is sourced by the nightly, beta, and release mozconfigs.
 
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-jemalloc
 if [ -f /c/builds/gapi.data ]; then
-  _gapi_keyfile=/c/builds/gapi.data
+  _gapi_keyfile=c:/builds/gapi.data
 else
-  _gapi_keyfile=/e/builds/gapi.data
+  _gapi_keyfile=e:/builds/gapi.data
 fi
 ac_add_options --with-google-api-keyfile=${_gapi_keyfile}
 
-ac_add_options --with-mozilla-api-keyfile=/c/builds/mozilla-desktop-geoloc-api.key
+ac_add_options --with-mozilla-api-keyfile=c:/builds/mozilla-desktop-geoloc-api.key
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 . $topsrcdir/build/win64/mozconfig.vs-latest