From 4be9ee7445f3d7ea905b213f29189b0d73bbcea4 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 2 Aug 2025 00:03:52 -0400 Subject: okay i guess --- .../files/chromium-140-android-gni-lf.patch | 21 ------------- .../chromium/files/chromium-140-gni-lf.patch | 36 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 21 deletions(-) delete mode 100644 www-client/chromium/files/chromium-140-android-gni-lf.patch create mode 100644 www-client/chromium/files/chromium-140-gni-lf.patch (limited to 'www-client/chromium/files') diff --git a/www-client/chromium/files/chromium-140-android-gni-lf.patch b/www-client/chromium/files/chromium-140-android-gni-lf.patch deleted file mode 100644 index eaba237..0000000 --- a/www-client/chromium/files/chromium-140-android-gni-lf.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 41aa76cfef..c22e55c0d6 100644 ---- a/build/config/android/config.gni -+++ b/build/config/android/config.gni -@@ -51,15 +51,7 @@ if (is_android) { - assert(checkout_android, - "Missing native Android toolchain support. |target_os| in your " + - ".gclient configuration file (in the parent directory of " + -- "src) must include \"android\". For example: -- --solutions = [ --... --] --target_os=[\"android\"] -- --After adding |target_os| please re-run \"gclient sync\". --") -+ "src) must include \"android\". For example: *snip") - } - } - diff --git a/www-client/chromium/files/chromium-140-gni-lf.patch b/www-client/chromium/files/chromium-140-gni-lf.patch new file mode 100644 index 0000000..7c08986 --- /dev/null +++ b/www-client/chromium/files/chromium-140-gni-lf.patch @@ -0,0 +1,36 @@ +diff --git a/build/config/android/config.gni b/build/config/android/config.gni +index 41aa76cfef..c22e55c0d6 100644 +--- a/build/config/android/config.gni ++++ b/build/config/android/config.gni +@@ -51,15 +51,7 @@ if (is_android) { + assert(checkout_android, + "Missing native Android toolchain support. |target_os| in your " + + ".gclient configuration file (in the parent directory of " + +- "src) must include \"android\". For example: +- +-solutions = [ +-... +-] +-target_os=[\"android\"] +- +-After adding |target_os| please re-run \"gclient sync\". +-") ++ "src) must include \"android\". For example: *snip") + } + } + +diff --git a/testing/test.gni b/testing/test.gni +index 9883ddad1d..fd2fa6ed5e 100644 +--- a/testing/test.gni ++++ b/testing/test.gni +@@ -300,9 +300,7 @@ template("mixed_test") { + + fuzzer_args_joined = string_join(" ", _fuzzer_args) + +- contents = "const char* kFuzzerArgs = \"${fuzzer_args_joined}\"; +-const char* kFuzzerBinary = \"${_fuzzer_binary_name}\"; +-" ++ contents = "const char* kFuzzerArgs = \"${fuzzer_args_joined}\";const char* kFuzzerBinary = \"${_fuzzer_binary_name}\";" + } + + _additional_fuzz_deps = [] -- cgit v1.2.3