Skip to content

Commit 0954e09

Browse files
committed
portable linux build of 145.0.7632.75-1
1 parent ca83e3a commit 0954e09

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

patches/series

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ungoogled-chromium/portablelinux/drop-nodejs-version-check.patch
2-
#ungoogled-chromium/portablelinux/use-oauth2-client-switches-as-default.patch
2+
ungoogled-chromium/portablelinux/use-oauth2-client-switches-as-default.patch
33
ungoogled-chromium/portablelinux/fix-compiling-on-arm64.patch
Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1+
diff --git a/google_apis/api_key_cache.cc b/google_apis/api_key_cache.cc
2+
index bbb9420f40..690445534b 100644
13
--- a/google_apis/api_key_cache.cc
24
+++ b/google_apis/api_key_cache.cc
3-
@@ -208,13 +208,13 @@ ApiKeyCache::ApiKeyCache(const DefaultAp
5+
@@ -235,14 +235,14 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) {
46

57
std::string default_client_id = CalculateKeyValue(
68
default_api_keys.google_default_client_id,
7-
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, std::string(),
8-
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, std::string(),
9-
environment.get(), command_line, gaia_config,
9+
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), nullptr,
10+
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), ::switches::kOAuth2ClientID,
11+
std::string(), environment.get(), command_line, gaia_config,
1012
default_api_keys.allow_override_via_environment,
1113
default_api_keys.allow_unset_values);
1214
std::string default_client_secret = CalculateKeyValue(
1315
default_api_keys.google_default_client_secret,
14-
- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
15-
+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
16-
std::string(), environment.get(), command_line, gaia_config,
16+
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
17+
- nullptr, std::string(), environment.get(), command_line, gaia_config,
18+
+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config,
1719
default_api_keys.allow_override_via_environment,
1820
default_api_keys.allow_unset_values);
21+

0 commit comments

Comments
 (0)