summaryrefslogtreecommitdiff
path: root/repo/chromium/chromium-revert-drop-of-system-java.patch
blob: 117a50f8e4f634488ce356eceefc2db578cdc38a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
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