From 38a375c1f4a97bcd931f21e71d10aec69a0f35c8 Mon Sep 17 00:00:00 2001 From: Gerrit User 1347058 <1347058@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Date: Fri, 17 Oct 2025 11:55:00 -0700 Subject: [PATCH] Create patch set 13 Change has been successfully rebased and submitted as df79165ad246fd2c8419cd813d9961f16d7d6016 9 is the latest approved patch-set. The change was submitted with unreviewed changes in the following files: ``` The name of the file: DEPS Insertions: 78, Deletions: 7. @@ -235,16 +235,6 @@ 'condition': 'checkout_android and non_git_source', 'dep_type': 'cipd', }, - 'src/tools/clang/dsymutil': { - 'packages': [ - { - 'package': 'chromium/llvm-build-tools/dsymutil', - 'version': 'OWlhXkmj18li3yhJk59Kmjbc5KdgLh56TwCd1qBdzlIC', - } - ], - 'condition': 'checkout_mac', - 'dep_type': 'cipd', - }, 'src/third_party/android_build_tools/aapt2/cipd': { @@ -454,6 +444,84 @@ 'condition': 'checkout_ios' }, + 'src/third_party/llvm-build/Release+Asserts': { + 'dep_type': 'gcs', + 'bucket': 'chromium-browser-clang', + 'objects': [ + { + # The Android libclang_rt.builtins libraries are currently only included in the Linux clang package. + 'object_name': 'Linux_x64/clang-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': 'f6a487ffd0e56ba7a39b063d85d1f8ff7846514f50635785730cffb7368872ce', + 'size_bytes': 55669844, + 'generation': 1759771493989631, + 'condition': 'host_os == "linux" or checkout_android', + }, + { + 'object_name': 'Linux_x64/llvmobjdump-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': 'fd644634db56977b072d951f26571ac41c9c298bf5989e99efeb150ee8427364', + 'size_bytes': 5666140, + 'generation': 1759771494159187, + 'condition': '((checkout_linux or checkout_mac or checkout_android) and host_os == "linux")', + }, + { + 'object_name': 'Mac/clang-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': '44811b6ed6868142c088807f6bcc0d08811a7b11d3f2bc2124c45868037e8cc3', + 'size_bytes': 53583464, + 'generation': 1759771495565305, + 'condition': 'host_os == "mac" and host_cpu == "x64"', + }, + { + 'object_name': 'Mac/clang-mac-runtime-library-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': '8a2e16410bede5d52c77a012f182dde2350b05e647f7c1acaf7823ce816b4422', + 'size_bytes': 1005144, + 'generation': 1759771503758969, + 'condition': 'checkout_mac and not host_os == "mac"', + }, + { + 'object_name': 'Mac/llvmobjdump-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': 'a10d075e19e7b614ffd8c5a65f04fbd45011ec74c735dda89f0b3780ab397329', + 'size_bytes': 5567160, + 'generation': 1759771495741126, + 'condition': 'host_os == "mac" and host_cpu == "x64"', + }, + { + 'object_name': 'Mac_arm64/clang-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': 'c97e4f62cdd77edf725ccbf4cd63b589302605bf643c871f83214f39e629b2ea', + 'size_bytes': 44593804, + 'generation': 1759771504972271, + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + }, + { + 'object_name': 'Mac_arm64/llvmobjdump-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': '7aa959752d6beafc74129e4822912021f855584e55a55600044f1d42b889f8b0', + 'size_bytes': 5292960, + 'generation': 1759771505201957, + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + }, + { + 'object_name': 'Win/clang-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': 'fc756186dea61e700bd0f885b585050d9356bbd7f942dafae25d38eef4671adf', + 'size_bytes': 47657436, + 'generation': 1759771514781908, + 'condition': 'host_os == "win"', + }, + { + 'object_name': 'Win/clang-win-runtime-library-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': '0a426702c9e0f92ea27f9611a1665cc5df9a58820360d3fa6a4026b9a0e5120f', + 'size_bytes': 2501292, + 'generation': 1759771523074183, + 'condition': 'checkout_win and not host_os == "win"', + }, + { + 'object_name': 'Win/llvmobjdump-llvmorg-22-init-8940-g4d4cb757-84.tar.xz', + 'sha256sum': '94c068f109e220e028a38f5beced7d6acd67725fc0b1da9fa8ed1b959f12d799', + 'size_bytes': 5673824, + 'generation': 1759771514962844, + 'condition': '(checkout_linux or checkout_mac or checkout_android) and host_os == "win"', + }, + ] + }, + # Everything coming after this is automatically updated by the auto-roller. # === ANDROID_DEPS Generated Code Start === # Generated by //third_party/android_deps/fetch_all.py @@ -760,13 +828,6 @@ ], }, { - # Pull clang if needed or requested via GYP_DEFINES. - # Note: On Win, this should run after win_toolchain, as it may use it. - 'name': 'clang', - 'pattern': '.', - 'action': ['python3', 'src/tools/clang/scripts/update.py'], - }, - { # Update LASTCHANGE. 'name': 'lastchange', 'pattern': '.', @@ -840,6 +901,32 @@ Var('rbe_instance'), ], }, + { + 'name': 'dsymutil_mac_arm64', + 'pattern': '.', + 'condition': 'host_os == "mac" and host_cpu == "arm64"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang', + '-s', 'src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1', + '-o', 'src/tools/clang/dsymutil/bin/dsymutil', + ], + }, + { + 'name': 'dsymutil_mac_x64', + 'pattern': '.', + 'condition': 'host_os == "mac" and host_cpu == "x64"', + 'action': [ 'python3', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang', + '-s', 'src/tools/clang/dsymutil/bin/dsymutil.x64.sha1', + '-o', 'src/tools/clang/dsymutil/bin/dsymutil', + ], + }, ] recursedeps = [ ``` Patch-set: 13 Patch-set-description: Rebase Subject: Roll chromium_revision 9dbf00e283..89484fe328 (1465343:1529283) Status: merged Commit: df79165ad246fd2c8419cd813d9961f16d7d6016 Tag: autogenerated:gerrit:merged Groups: 9108a97fb385e65ea5e1e79cde8e5063b0a94f6e Label: Code-Review=+1, 321421773984ec4f2134fd886da896bbcd789a31 Gerrit User 1115898 <1115898@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Label: Code-Review=+1, 7f7dd4a2a2fa416a8484e2413cd7d9dfd7f7468a Gerrit User 1178490 <1178490@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Label: Commit-Queue=+2, 7f5450472a3f699096c574ef2dbd10d0ea75a53e Gerrit User 1339017 <1339017@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Label: SUBM=+1, 533eb409f9d4fd7572d7a3b63e4dd49403758cd3 Submission-id: 7036460 Submitted-with: OK Submitted-with: Rule-Name: gerrit~DefaultSubmitRule Submitted-with: MAY: Auto-Submit Submitted-with: MAY: Code-Coverage Submitted-with: MAY: Code-Review: Gerrit User 1115898 <1115898@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Submitted-with: MAY: Commit-Queue: Gerrit User 1339017 <1339017@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Submitted-with: MAY: Feels Submitted-with: MAY: Bot-Commit Submitted-with: MAY: Owners-Override Submitted-with: MAY: Lint Submitted-with: OK Submitted-with: Rule-Name: Code-Owners Base: 738a53ce271acc8cde81798bbdd22dca2fde81a3 Ours: 7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808 Theirs: e237e8d7fb5d39d8666e29ae868177878c156c3e Merge-Strategy: simple-two-way-in-core Contains-Conflicts: false --- 7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808 | 178 +++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808 diff --git a/7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808 b/7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808 new file mode 100644 index 000000000..332feb777 --- /dev/null +++ b/7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808 @@ -0,0 +1,178 @@ +{ + "comments": [], + "submitRequirementResults": [ + { + "submitRequirement": { + "name": "Admin-Approval", + "description": { + "value": "Changes to refs/meta/config must be approved by a git admin." + }, + "applicabilityExpression": { + "value": { + "expressionString": "branch:refs/meta/config" + } + }, + "submittabilityExpression": { + "expressionString": "(uploaderin:mdb/chrome-git-admins OR label:Code-Review\u003dMAX,group\u003dmdb/chrome-git-admins) AND label:Code-Review\u003dMAX,user\u003dnon_uploader AND -label:Code-Review\u003dMIN" + }, + "overrideExpression": { + "value": { + "expressionString": "label:Bot-Commit\u003d+1 AND -label:Code-Review\u003dMIN" + } + }, + "allowOverrideInChildProjects": false + }, + "applicabilityExpressionResult": { + "value": {"expression":{"expressionString":"branch:refs/meta/config"},"status":"FAIL","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":["branch:refs/meta/config"],"atomExplanations":{"value":{"branch:refs/meta/config":""}}} + }, + "submittabilityExpressionResult": { + "value": {"expression":{"expressionString":"(uploaderin:mdb/chrome-git-admins OR label:Code-Review=MAX,group=mdb/chrome-git-admins) AND label:Code-Review=MAX,user=non_uploader AND -label:Code-Review=MIN"},"status":"NOT_EVALUATED","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":[],"atomExplanations":{"value":null}} + }, + "overrideExpressionResult": { + "value": {"expression":{"expressionString":"label:Bot-Commit=+1 AND -label:Code-Review=MIN"},"status":"NOT_EVALUATED","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":[],"atomExplanations":{"value":null}} + }, + "patchSetCommitId": "7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808", + "legacy": { + "value": false + }, + "forced": {}, + "hidden": {} + }, + { + "submitRequirement": { + "name": "Code-Review", + "description": { + "value": "If the author is a libyuv committer, code review is required from one other committer. Otherwise, code review is required from two committers." + }, + "applicabilityExpression": { + "value": { + "expressionString": "-branch:refs/meta/config" + } + }, + "submittabilityExpression": { + "expressionString": "((uploaderin:cria/project-libyuv-committers AND label:Code-Review\u003dMAX,user\u003dnon_uploader) OR label:Code-Review\u003dMAX,count\u003e\u003d2) AND -label:Code-Review\u003dMIN" + }, + "overrideExpression": { + "value": { + "expressionString": "label:Bot-Commit\u003d+1 AND -label:Code-Review\u003dMIN" + } + }, + "allowOverrideInChildProjects": true + }, + "applicabilityExpressionResult": { + "value": {"expression":{"expressionString":"-branch:refs/meta/config"},"status":"PASS","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":["branch:refs/meta/config"],"atomExplanations":{"value":{"branch:refs/meta/config":""}}} + }, + "submittabilityExpressionResult": { + "value": {"expression":{"expressionString":"((uploaderin:cria/project-libyuv-committers AND label:Code-Review=MAX,user=non_uploader) OR label:Code-Review=MAX,count>=2) AND -label:Code-Review=MIN"},"status":"PASS","errorMessage":{"value":null},"passingAtoms":["label:Code-Review=MAX,user=non_uploader","uploaderin:cria/project-libyuv-committers","label:Code-Review=MAX,count>=2"],"failingAtoms":["label:Code-Review=MIN"],"atomExplanations":{"value":{"label:Code-Review=MIN":"","label:Code-Review=MAX,user=non_uploader":"","uploaderin:cria/project-libyuv-committers":"","label:Code-Review=MAX,count>=2":""}}} + }, + "overrideExpressionResult": { + "value": {"expression":{"expressionString":"label:Bot-Commit=+1 AND -label:Code-Review=MIN"},"status":"FAIL","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":["label:Bot-Commit=+1","label:Code-Review=MIN"],"atomExplanations":{"value":{"label:Bot-Commit=+1":"","label:Code-Review=MIN":""}}} + }, + "patchSetCommitId": "7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808", + "legacy": { + "value": false + }, + "forced": {}, + "hidden": {} + }, + { + "submitRequirement": { + "name": "No-Unresolved-Comments", + "description": { + "value": "Changes that have unresolved comments are not submittable. Unless overridden with Unresolved-Comment-Reason: \u003creason\u003e line in change message." + }, + "applicabilityExpression": { + "value": { + "expressionString": "has:unresolved" + } + }, + "submittabilityExpression": { + "expressionString": "-has:unresolved" + }, + "overrideExpression": { + "value": { + "expressionString": "message:\"^.*Unresolved-Comment-Reason:.*\"" + } + }, + "allowOverrideInChildProjects": false + }, + "applicabilityExpressionResult": { + "value": {"expression":{"expressionString":"has:unresolved"},"status":"FAIL","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":["has:unresolved"],"atomExplanations":{"value":{"has:unresolved":""}}} + }, + "submittabilityExpressionResult": { + "value": {"expression":{"expressionString":"-has:unresolved"},"status":"NOT_EVALUATED","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":[],"atomExplanations":{"value":null}} + }, + "overrideExpressionResult": { + "value": {"expression":{"expressionString":"message:\"^.*Unresolved-Comment-Reason:.*\""},"status":"NOT_EVALUATED","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":[],"atomExplanations":{"value":null}} + }, + "patchSetCommitId": "7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808", + "legacy": { + "value": false + }, + "forced": {}, + "hidden": {} + }, + { + "submitRequirement": { + "name": "Review-Enforcement", + "description": { + "value": "Two trusted contributors must approve the change. Uploading the change or voting positively on Code-Review count as approval. For Google employees, using a trusted device is required (go/gerrit-onboarding#review-enforcement). For non-Google employees, ReAuth is required (https://chromium.googlesource.com/chromium/src/+/HEAD/docs/gerrit_reauth.md)." + }, + "applicabilityExpression": { + "value": { + "expressionString": "is:review-enforced_gerrit" + } + }, + "submittabilityExpression": { + "expressionString": "is:review-enforcement-satisfied_gerrit" + }, + "overrideExpression": {}, + "allowOverrideInChildProjects": false + }, + "applicabilityExpressionResult": { + "value": {"expression":{"expressionString":"is:review-enforced_gerrit"},"status":"PASS","errorMessage":{"value":null},"passingAtoms":["is:review-enforced_gerrit"],"failingAtoms":[],"atomExplanations":{"value":{"is:review-enforced_gerrit":""}}} + }, + "submittabilityExpressionResult": { + "value": {"expression":{"expressionString":"is:review-enforcement-satisfied_gerrit"},"status":"PASS","errorMessage":{"value":null},"passingAtoms":["is:review-enforcement-satisfied_gerrit"],"failingAtoms":[],"atomExplanations":{"value":{"is:review-enforcement-satisfied_gerrit":"Required approval count satisfied"}}} + }, + "overrideExpressionResult": {}, + "patchSetCommitId": "7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808", + "legacy": { + "value": false + }, + "forced": {}, + "hidden": {} + }, + { + "submitRequirement": { + "name": "Verified", + "description": { + "value": "Submit requirement for the \u0027Verified\u0027 label" + }, + "applicabilityExpression": { + "value": { + "expressionString": "is:false" + } + }, + "submittabilityExpression": { + "expressionString": "is:true" + }, + "overrideExpression": {}, + "allowOverrideInChildProjects": true + }, + "applicabilityExpressionResult": { + "value": {"expression":{"expressionString":"is:false"},"status":"FAIL","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":["is:false"],"atomExplanations":{"value":{"is:false":""}}} + }, + "submittabilityExpressionResult": { + "value": {"expression":{"expressionString":"is:true"},"status":"NOT_EVALUATED","errorMessage":{"value":null},"passingAtoms":[],"failingAtoms":[],"atomExplanations":{"value":null}} + }, + "overrideExpressionResult": {}, + "patchSetCommitId": "7eddef1bd7719fc4d4bbab79bc4ce34d0e13a808", + "legacy": { + "value": false + }, + "forced": {}, + "hidden": {} + } + ] +} \ No newline at end of file