From ea08ed3d96501948bfb0148cc35477d966022e93 Mon Sep 17 00:00:00 2001 From: crypto-das <55387659+crypto-das@users.noreply.github.com> Date: Wed, 3 Apr 2024 21:35:30 +0300 Subject: [PATCH 1/3] Attempt to make fetch faster --- build_android/chromium-gost-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_android/chromium-gost-prepare.sh b/build_android/chromium-gost-prepare.sh index 180a8b5..74a943f 100755 --- a/build_android/chromium-gost-prepare.sh +++ b/build_android/chromium-gost-prepare.sh @@ -14,7 +14,7 @@ git reset HEAD~ --hard cd $CHROMIUM_PATH git reset HEAD~ --hard -git fetch --tags +git fetch origin tag $CHROMIUM_TAG --no-tags git checkout -b temp tags/$CHROMIUM_TAG git show-ref --quiet refs/heads/$GOST_BRANCH && git branch -D $GOST_BRANCH git checkout -b $GOST_BRANCH tags/$CHROMIUM_TAG From 4ae4686944fe6dc9790275f83e3c9e8b2d41c6f3 Mon Sep 17 00:00:00 2001 From: crypto-das <55387659+crypto-das@users.noreply.github.com> Date: Wed, 3 Apr 2024 21:36:41 +0300 Subject: [PATCH 2/3] Fix official build by disabling PGO --- build_android/chromium-gost-build-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_android/chromium-gost-build-release.sh b/build_android/chromium-gost-build-release.sh index d13350f..219e49d 100755 --- a/build_android/chromium-gost-build-release.sh +++ b/build_android/chromium-gost-build-release.sh @@ -4,5 +4,5 @@ cd $(dirname $0) . ./chromium-gost-env.sh cd $CHROMIUM_PATH -gn gen out/RELEASE --args="target_os=\"android\" target_cpu=\"arm64\" is_debug=false symbol_level=0 is_official_build=true treat_warnings_as_errors=false $CHROMIUM_FLAGS $CHROMIUM_PRIVATE_ARGS" +gn gen out/RELEASE --args="target_os=\"android\" target_cpu=\"arm64\" is_debug=false symbol_level=0 is_official_build=true treat_warnings_as_errors=false chrome_pgo_phase=0 $CHROMIUM_FLAGS $CHROMIUM_PRIVATE_ARGS" ninja -C out/RELEASE chrome_public_apk From a009408a6b552ce3e2c12da7c8c21d9b693a22b6 Mon Sep 17 00:00:00 2001 From: crypto-das <55387659+crypto-das@users.noreply.github.com> Date: Wed, 3 Apr 2024 21:37:54 +0300 Subject: [PATCH 3/3] Fix Android patch and adopt it to new version --- patch/android.patch | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/patch/android.patch b/patch/android.patch index 866fae7..ed5b9fa 100755 --- a/patch/android.patch +++ b/patch/android.patch @@ -1,8 +1,21 @@ +From 3535a7786594750d2fbac5ee0190286e780e4cc4 Mon Sep 17 00:00:00 2001 +From: crypto-das <55387659+crypto-das@users.noreply.github.com> +Date: Wed, 6 Mar 2024 10:44:28 +0000 +Subject: [PATCH] Android CSP integration + +--- + chrome/android/BUILD.gn | 12 ++++++++++++ + chrome/android/chrome_public_apk_tmpl.gni | 9 +++++++++ + .../res_chromium_base/values/channel_constants.xml | 8 ++++---- + .../chrome/browser/ChromeTabbedActivity.java | 14 ++++++++++++++ + .../ui_thread_search_terms_data_android.cc | 2 +- + 5 files changed, 40 insertions(+), 5 deletions(-) + diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 271d8ffbb5b7b..18073719f9e95 100644 +index d3e324f0f6fbb..4addd65570a37 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -284,8 +284,20 @@ if (current_toolchain == default_toolchain) { +@@ -282,8 +282,20 @@ if (current_toolchain == default_toolchain) { srcjar_deps = [ ":chrome_android_java_google_api_keys_srcjar" ] } @@ -24,10 +37,10 @@ index 271d8ffbb5b7b..18073719f9e95 100644 ":chrome_app_java_resources", ":chrome_public_apk_template_resources", diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 54c50b54bb7ca..0f00e512bc425 100644 +index df3d58c8bade4..67d713b55ea2a 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -729,6 +729,15 @@ template("chrome_common_apk_or_module_tmpl") { +@@ -711,6 +711,15 @@ template("chrome_common_apk_or_module_tmpl") { } } @@ -61,20 +74,21 @@ index cc1f2a30cb3c5..3953c9ad3800f 100644 + Chromium-Gost quick action search diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 74e852c79190b..2f5afed5e07f2 100644 +index d61269f9a8fea..9a218fcb02137 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -252,11 +252,22 @@ import java.util.Map; - import java.util.Set; - import java.util.concurrent.atomic.AtomicBoolean; +@@ -267,12 +267,23 @@ import java.util.concurrent.atomic.AtomicBoolean; + import java.util.function.BooleanSupplier; + import java.util.function.DoubleConsumer; +import ru.CryptoPro.JCSP.NCSPConfig; + /** - * This is the main activity for ChromeMobile when not running in document mode. All the tabs - * are accessible via a chrome specific tab switching UI. + * This is the main activity for ChromeMobile when not running in document mode. All the tabs are + * accessible via a chrome specific tab switching UI. */ - public class ChromeTabbedActivity extends ChromeActivity { + public class ChromeTabbedActivity extends ChromeActivity + implements MismatchedIndicesHandler { + private static final String APP_LOGGER_TAG = "CSP"; + + private boolean initCSPProviders() { @@ -87,7 +101,7 @@ index 74e852c79190b..2f5afed5e07f2 100644 private static final String TAG = "ChromeTabbedActivity"; protected static final String WINDOW_INDEX = "window_index"; -@@ -525,6 +536,9 @@ public class ChromeTabbedActivity extends ChromeActivity