aboutsummaryrefslogtreecommitdiffstats
path: root/community/chromium/chromium-revert-drop-of-system-java.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/chromium/chromium-revert-drop-of-system-java.patch')
-rw-r--r--community/chromium/chromium-revert-drop-of-system-java.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/community/chromium/chromium-revert-drop-of-system-java.patch b/community/chromium/chromium-revert-drop-of-system-java.patch
new file mode 100644
index 00000000000..24355bf42b1
--- /dev/null
+++ b/community/chromium/chromium-revert-drop-of-system-java.patch
@@ -0,0 +1,17 @@
+This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+allows using /usr/bin/java instead of a downloaded one (that doesn't work on musl)
+--
+--- 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