summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorwatk <watk@chromium.org>2015-04-21 14:00:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-21 21:01:48 +0000
commit8c48adbf60df972f0abd4367596f473af265d7a7 (patch)
tree4cf24d277b56229cc33d611c28a080b7b393757b /google_apis
parent3546792164881c760ce9c36ed6a3da0a61dfaf0c (diff)
downloadchromium_src-8c48adbf60df972f0abd4367596f473af265d7a7.zip
chromium_src-8c48adbf60df972f0abd4367596f473af265d7a7.tar.gz
chromium_src-8c48adbf60df972f0abd4367596f473af265d7a7.tar.bz2
Quote api key defines in google_apis/BUILD.gn.
Previously "google_api_key" and related variables had to be wrapped in escaped quotes in the gn args. Now the quotes are added in the build file. BUG=none TEST=gn gen and build Review URL: https://codereview.chromium.org/1101573002 Cr-Commit-Position: refs/heads/master@{#326115}
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/BUILD.gn11
1 files changed, 6 insertions, 5 deletions
diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn
index a595bd8..6cf7526 100644
--- a/google_apis/BUILD.gn
+++ b/google_apis/BUILD.gn
@@ -67,13 +67,14 @@ config("key_defines") {
defines += [ "USE_OFFICIAL_GOOGLE_API_KEYS=1" ]
}
if (google_api_key != "") {
- defines += [ "GOOGLE_API_KEY=$google_api_key" ]
+ defines += [ "GOOGLE_API_KEY=\"$google_api_key\"" ]
}
if (google_default_client_id != "") {
- defines += [ "GOOGLE_DEFAULT_CLIENT_ID=$google_default_client_id" ]
+ defines += [ "GOOGLE_DEFAULT_CLIENT_ID=\"$google_default_client_id\"" ]
}
if (google_default_client_secret != "") {
- defines += [ "GOOGLE_DEFAULT_CLIENT_SECRET=$google_default_client_secret" ]
+ defines +=
+ [ "GOOGLE_DEFAULT_CLIENT_SECRET=\"$google_default_client_secret\"" ]
}
}
@@ -102,10 +103,10 @@ source_set("google_apis") {
"gaia/oauth2_access_token_consumer.h",
"gaia/oauth2_access_token_fetcher.cc",
"gaia/oauth2_access_token_fetcher.h",
- "gaia/oauth2_access_token_fetcher_impl.cc",
- "gaia/oauth2_access_token_fetcher_impl.h",
"gaia/oauth2_access_token_fetcher_immediate_error.cc",
"gaia/oauth2_access_token_fetcher_immediate_error.h",
+ "gaia/oauth2_access_token_fetcher_impl.cc",
+ "gaia/oauth2_access_token_fetcher_impl.h",
"gaia/oauth2_api_call_flow.cc",
"gaia/oauth2_api_call_flow.h",
"gaia/oauth2_mint_token_flow.cc",