include.gypi variables to specify API keys or use internal header for keys.

google_apis/google_apis.gyp

Index: google_apis/google_apis.gyp
diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp
index b0b81e49c655d5bd206e1011bba7f29a71111606..aa09f4a5f62c4c3e10b7097ab9290d4c2aa1a04d 100644
--- a/google_apis/google_apis.gyp
+++ b/google_apis/google_apis.gyp
@@ -18,6 +18,37 @@
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:net',
       ],
+      'conditions': [
+        ['google_api_key!=""', {
+          'defines': ['GOOGLE_API_KEY="<(google_api_key)"'],
+        }],
+        # Once the default definitions for the various keys in
+        # google_apis/google_api_keys.cc are all made empty, the next
+        # two conditionals can set just GOOGLE_DEFAULT_CLIENT_ID/SECRET.
+        # Until then, we have different semantics on the gyp variables
+        # google_default_client_id/secret and setting the environment
+        # variables of the (upper-case) same name (the latter are used
+        # as the default for unset client IDs/secrets, whereas the
+        # former overrides all client IDs/secrets).
+        # TODO(joi): Fix the above semantic mismatch once possible.
+        ['google_default_client_id!=""', {
+          'defines': [
+            'GOOGLE_CLIENT_ID_MAIN="<(google_default_client_id)"',
+            'GOOGLE_CLIENT_ID_CLOUD_PRINT="<(google_default_client_id)"',
+            'GOOGLE_CLIENT_ID_REMOTING="<(google_default_client_id)"',
+          ]
+        }],
+        ['google_default_client_secret!=""', {
+          'defines': [
+            'GOOGLE_CLIENT_SECRET_MAIN="<(google_default_client_secret)"',
+            'GOOGLE_CLIENT_SECRET_CLOUD_PRINT="<(google_default_client_secret)"',
+            'GOOGLE_CLIENT_SECRET_REMOTING="<(google_default_client_secret)"',
+          ]
+        }],
+        ['use_official_google_api_keys==1', {
+          'defines': ['USE_OFFICIAL_GOOGLE_API_KEYS=1'],
+        }],
+      ],
       'sources': [
         'gaia/gaia_auth_consumer.cc',
         'gaia/gaia_auth_consumer.h',