Rebase to 136 (#2042) (c9e77d31) · Commits · e / os / cromite

.github/workflows/build_cromite.yaml

+3 −3

Original line number	Diff line number	Diff line
		@@ -182,9 +182,9 @@ jobs:
		KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
		KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/arm64/kythe
		# cross build
		DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/sdks/Win11SDK_10.0.22621.2428/
		WINDOWSSDKDIR: "/win_sdk/sdks/Win11SDK_10.0.22621.2428/Windows Kits/10/"
		GYP_MSVS_OVERRIDE_PATH: /win_sdk/sdks/Win11SDK_10.0.22621.2428/
		DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/sdks/Win11SDK_10.0.26100/
		WINDOWSSDKDIR: "/win_sdk/sdks/Win11SDK_10.0.26100/Windows Kits/10/"
		GYP_MSVS_OVERRIDE_PATH: /win_sdk/sdks/Win11SDK_10.0.26100/
		# compile in debug mode
		TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
		TARGET_OS: ${{ github.event.inputs.target_os }}

build/RELEASE

+1 −1

Original line number	Diff line number	Diff line
		135.0.7049.115
		No newline at end of file
		136.0.7103.60
		No newline at end of file

build/components/query4_0.json

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		)]}' {
		"response": {
		"server": "prod",
		"protocol": "4.0",
		"apps": [
		{
		"appid": "gcmjkmgdlgnkkcocmoeiminaijmmjnii",
		"status": "ok",
		"updatecheck": {
		"status": "ok",
		"nextversion": "1.0.0",
		"pipelines": [
		{
		"operations": [
		{
		"type": "download",
		"urls": [ { "url": "https://www.cromite.org/components/fonts_component.zip" } ],
		"out": { "sha256": "22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482" },
		"size": 60716451
		},
		{
		"type": "crx3",
		"in": { "sha256": "22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482" }
		}
		]
		}
		]
		}
		}
		]
		}
		}

build/cromite_patches_list.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ Do-not-link-with-libatomic.patch
		Do-not-check-for-the-presence-of-use-remoteexec.patch
		bromite-build-utils.patch
		Add-cromite-flags-support.patch
		Force-use-vpython3-for-some-scripts.patch
		Fix-chromium-vanilla.patch
		Final-patch-for-chromium-vanilla.patch

		@@ -295,6 +296,7 @@ Prevent-mouse-wheel-fingerprinting-on-Windows.patch
		Enable-component-updater.patch
		Android-fonts-fingerprinting-mitigation.patch
		Disable-Android-Tab-Declutter.patch
		Disable-CSSDynamicRangeLimit.patch

		# temporary or wip patches
		Temp-PerformanceNavigationTiming-privacy-fix.patch

build/patches/AImageReader-CFI-crash-mitigations.patch

+7 −7

Original line number	Diff line number	Diff line
		@@ -90,10 +90,10 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
		diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
		--- a/chrome/browser/flag-metadata.json
		+++ b/chrome/browser/flag-metadata.json
		@@ -3268,6 +3268,10 @@
		"name": "enable-identity-in-auth-error",
		"owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],
		"expiry_milestone": 135
		@@ -3344,6 +3344,10 @@
		"chrome-signin-team@google.com"
		],
		"expiry_milestone": 138
		+ },{
		+ "name": "enable-image-reader", // Bromite: do not expire
		+ "owners": [ "vikassoni@chromium.org", "liberato@chromium.org" ], // flag
		@@ -119,7 +119,7 @@ new file mode 100644
		diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
		--- a/gpu/config/gpu_driver_bug_list.json
		+++ b/gpu/config/gpu_driver_bug_list.json
		@@ -2593,6 +2593,22 @@
		@@ -2597,6 +2597,22 @@
		"no_downscaled_overlay_promotion"
		]
		},
		@@ -171,7 +171,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
		diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
		--- a/gpu/config/gpu_util.cc
		+++ b/gpu/config/gpu_util.cc
		@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
		@@ -127,6 +127,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
		#if !BUILDFLAG(IS_ANDROID)
		return kGpuFeatureStatusDisabled;
		#else
		@@ -215,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
		#endif

		#if BUILDFLAG(ENABLE_VULKAN)
		@@ -692,6 +693,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
		@@ -688,6 +689,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
		}
		#endif // BUILDFLAG(IS_WIN)