commit 515da33aec08cbf16b0fdb1b775f6c1247c0b833
author Ryo Hashimoto <hashimoto@chromium.org> Mon Aug 07 05:27:33 2023
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 07 09:06:03 2023
tree 79f0735c777c8af2c07b1304720cbbcf66f31ad8
parent a9edc178f87411707214a1851aa676442256e418

apply_patches.py: Use `git apply` instead of `patch`

BUG=b:293001194
TEST=./libchrome_tools/apply_patches.py

Change-Id: I8e45e9baeab8a7025ce222dc92bd0bbe997f6a32
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/libchrome/+/4756342
Reviewed-by: Grace Cham <hscham@chromium.org>
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>
Tested-by: Ryo Hashimoto <hashimoto@chromium.org>

libchrome_tools/apply_patches.py

diff --git a/libchrome_tools/apply_patches.py b/libchrome_tools/apply_patches.py
index 666a208..076f650 100755
--- a/libchrome_tools/apply_patches.py
+++ b/libchrome_tools/apply_patches.py
@@ -44,14 +44,12 @@
         ):
             logging.info("Applying %s...", patch)
             if patch.endswith(".patch"):
+                # "-C1" to be compatible with `patch` and to be more robust
+                # against upstream changes.
                 cmd_args = [
-                    "patch",
-                    "--strip=1",
-                    "--force",
-                    "--get=0",
-                    "--no-backup-if-mismatch",
-                    "--quiet",
-                    "--input",
+                    "git",
+                    "apply",
+                    "-C1",
                     patch,
                 ]
             elif os.stat(patch).st_mode & stat.S_IXUSR != 0: