From 91f5a2a77a7369f452b2d88989d46d11a81a539e Mon Sep 17 00:00:00 2001 From: Gerrit User 1347058 <1347058@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Date: Thu, 16 Oct 2025 15:01:43 -0700 Subject: [PATCH] Create patch set 5 Change has been successfully rebased and submitted as 738a53ce271acc8cde81798bbdd22dca2fde81a3 1 is the latest approved patch-set. The change was submitted with unreviewed changes in the following files: ``` The name of the file: DEPS Insertions: 26, Deletions: 10. @@ -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': '8e05e94b4cc73ba182bdd448a1eca875ab9c4911', - } - ], - 'condition': 'checkout_mac', - 'dep_type': 'cipd', - }, 'src/third_party/android_build_tools/aapt2/cipd': { @@ -1654,6 +1644,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: 5 Patch-set-description: Rebase Subject: Fix mac_asan bot by using right architecture for dsymutil Status: merged Commit: 738a53ce271acc8cde81798bbdd22dca2fde81a3 Tag: autogenerated:gerrit:merged Groups: 7ea64ac895e2882665bf74308da0d588f1636346 Label: Code-Review=+1, 231f716b7e763a43b0c754e1b90b641a4760f0a1 Gerrit User 1115898 <1115898@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Label: Commit-Queue=+2, 581114d64871ef84428eb2083b5b9e3b7aa5e980 Gerrit User 1339017 <1339017@3ce6091f-6c88-37e8-8c75-72f92ae8dfba> Label: SUBM=+1, 44ea43017f7701cd5418d4627fc0b3baaf81d5bd Submission-id: 7050423 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: fcd7060e0dbcc3928b1bc7a8953245aacfc74a38 Ours: b0d25362f20655e29323933264f1a663f747edd7 Theirs: 1f62f149501c3cf54d059e50fc2c659b5b05b1f7 Merge-Strategy: simple-two-way-in-core Contains-Conflicts: false --- b0d25362f20655e29323933264f1a663f747edd7 | 178 +++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 b0d25362f20655e29323933264f1a663f747edd7 diff --git a/b0d25362f20655e29323933264f1a663f747edd7 b/b0d25362f20655e29323933264f1a663f747edd7 new file mode 100644 index 000000000..ef2b93611 --- /dev/null +++ b/b0d25362f20655e29323933264f1a663f747edd7 @@ -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": "b0d25362f20655e29323933264f1a663f747edd7", + "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"],"failingAtoms":["label:Code-Review=MIN","label:Code-Review=MAX,count>=2"],"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": "b0d25362f20655e29323933264f1a663f747edd7", + "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": "b0d25362f20655e29323933264f1a663f747edd7", + "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": "b0d25362f20655e29323933264f1a663f747edd7", + "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": "b0d25362f20655e29323933264f1a663f747edd7", + "legacy": { + "value": false + }, + "forced": {}, + "hidden": {} + } + ] +} \ No newline at end of file