Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
avoid conflict with google_apis defines
Browse files Browse the repository at this point in the history
bridiver committed Sep 29, 2016
1 parent c60beef commit ecc3237
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions common.gypi
Original file line number Diff line number Diff line change
@@ -44,8 +44,8 @@
'v8_postmortem_support': 'false',
'v8_enable_i18n_support': 'false',
'v8_inspector': 'false',
'google_api_key%': '',
'google_api_endpoint%': '',
'electron_google_api_key%': '',
'electron_google_api_endpoint%': '',
},
# Settings to compile node under Windows.
'target_defaults': {
@@ -289,17 +289,17 @@
],
},
'conditions': [
['google_api_key!=""', {
['electron_google_api_key!=""', {
'target_defaults': {
'defines': [
'GOOGLEAPIS_API_KEY="<(google_api_key)"',
'GOOGLEAPIS_API_KEY="<(electron_google_api_key)"',
],
}
}],
['google_api_endpoint!=""', {
['electron_google_api_endpoint!=""', {
'target_defaults': {
'defines': [
'GOOGLEAPIS_ENDPOINT="<(google_api_endpoint)"',
'GOOGLEAPIS_ENDPOINT="<(electron_google_api_endpoint)"',
],
}
}],

0 comments on commit ecc3237

Please sign in to comment.