summaryrefslogtreecommitdiff
path: root/extra/chromium/chromium-revert-drop-of-system-java.patch
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2022-05-01 21:21:05 +0000
committerdavidovski <david@davidovski.xyz>2022-05-01 21:21:05 +0000
commit606bc59d0f8f67815c6a717843835477d44db6b3 (patch)
tree687b3fe5bc844b90a3841e1ea543aa9f9934a93a /extra/chromium/chromium-revert-drop-of-system-java.patch
parent1084afc3c4d9c83e61620de60ba59a4393a33cb0 (diff)
added ungoogled chromium
Diffstat (limited to 'extra/chromium/chromium-revert-drop-of-system-java.patch')
-rw-r--r--extra/chromium/chromium-revert-drop-of-system-java.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/extra/chromium/chromium-revert-drop-of-system-java.patch b/extra/chromium/chromium-revert-drop-of-system-java.patch
new file mode 100644
index 0000000..117a50f
--- /dev/null
+++ b/extra/chromium/chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,15 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+--- a/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200
++++ b/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200
+@@ -13,8 +13,9 @@
+
+
+ _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
+-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
+-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
++_JAVA_BIN = "java"
++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN
+
+ class Compiler(object):
+ """Runs the Closure compiler on given source files to typecheck them