7 changed files with 49 additions and 14 deletions
@ -39,7 +39,7 @@ author: Wengling Chen <[email protected]> |
|||
<message name="IDS_LANGUAGE_SETTINGS" desc="Title for the Languages settings screen that allows users to manage their languages preferences. [CHAR-LIMIT=32]"> |
|||
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
|
|||
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
|
|||
@@ -487,6 +487,8 @@ public final class ChromePreferenceKeys
|
|||
@@ -490,6 +490,8 @@ public final class ChromePreferenceKeys
|
|||
public static final String FONT_USER_FONT_SCALE_FACTOR = "user_font_scale_factor"; |
|||
public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom"; |
|||
|
|||
@ -48,7 +48,7 @@ author: Wengling Chen <[email protected]> |
|||
public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; |
|||
|
|||
/** Keys used to save settings related to homepage. */ |
|||
@@ -1001,6 +1003,7 @@ public final class ChromePreferenceKeys
|
|||
@@ -1005,6 +1007,7 @@ public final class ChromePreferenceKeys
|
|||
FIRST_RUN_SKIPPED_BY_POLICY, |
|||
FLAGS_CACHED.pattern(), |
|||
FLAGS_FIELD_TRIAL_PARAM_CACHED.pattern(), |
|||
|
@ -75,7 +75,7 @@ author: Wengling Chen <[email protected]> |
|||
} |
|||
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
|
|||
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
|
|||
@@ -488,6 +488,7 @@ public final class ChromePreferenceKeys
|
|||
@@ -491,6 +491,7 @@ public final class ChromePreferenceKeys
|
|||
public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom"; |
|||
|
|||
public static final String FLAGS_FORCE_DESKTOP_MODE_ENABLED = "Chrome.UngoogledChromium.ForceDesktopMode"; |
|||
@ -83,7 +83,7 @@ author: Wengling Chen <[email protected]> |
|||
|
|||
public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info"; |
|||
|
|||
@@ -1004,6 +1005,7 @@ public final class ChromePreferenceKeys
|
|||
@@ -1008,6 +1009,7 @@ public final class ChromePreferenceKeys
|
|||
FLAGS_CACHED.pattern(), |
|||
FLAGS_FIELD_TRIAL_PARAM_CACHED.pattern(), |
|||
FLAGS_FORCE_DESKTOP_MODE_ENABLED, |
|||
|
@ -2,8 +2,8 @@ description: Fix trichrome apk build |
|||
author: Wengling Chen <[email protected]> |
|||
|
|||
---
|
|||
chrome/android/BUILD.gn | 23 +++++++++++++++++++++++ |
|||
1 file changed, 23 insertions(+) |
|||
chrome/android/BUILD.gn | 38 ++++++++++++++++++++++++++++++++++++++ |
|||
1 file changed, 38 insertions(+) |
|||
|
|||
--- a/chrome/android/BUILD.gn
|
|||
+++ b/chrome/android/BUILD.gn
|
|||
@ -51,3 +51,25 @@ author: Wengling Chen <[email protected]> |
|||
} |
|||
} |
|||
|
|||
@@ -3314,6 +3337,21 @@ if (android_64bit_target_cpu) {
|
|||
use_trichrome_library = true |
|||
static_library_provider = ":trichrome_library_32_apk" |
|||
} |
|||
+
|
|||
+ monochrome_public_apk_or_module_tmpl("trichrome_chrome_64_apk") {
|
|||
+ version_code = trichrome_version_code
|
|||
+ version_name = chrome_version_name
|
|||
+ apk_name = "TrichromeChrome64"
|
|||
+ target_type = "android_apk"
|
|||
+ use_trichrome_library = true
|
|||
+ static_library_provider = ":trichrome_library_64_apk"
|
|||
+ if (trichrome_synchronized_proguard) {
|
|||
+ resource_ids_provider_dep = "//android_webview:trichrome_webview_64_apk"
|
|||
+ }
|
|||
+
|
|||
+ is_64_bit_browser = true
|
|||
+ include_32_bit_webview = false
|
|||
+ }
|
|||
} |
|||
|
|||
generate_jni("chrome_jni_headers") { |
|||
|
Loading…
Reference in new issue