diff options
| author | davidovski <david@davidovski.xyz> | 2022-05-04 23:52:30 +0100 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-05-04 23:52:30 +0100 |
| commit | 739c65c54cb0e957df5e9b76f93fb02554e5cac3 (patch) | |
| tree | 09ddfa0a342f3ea9de136cb50abdd79821bf1b53 /repo/apps/chromium/chromium-revert-drop-of-system-java.patch | |
| parent | 4c585ad54388285500fd18a6aaa516894e0f2c16 (diff) | |
moved everything to new file formatting
Diffstat (limited to 'repo/apps/chromium/chromium-revert-drop-of-system-java.patch')
| -rw-r--r-- | repo/apps/chromium/chromium-revert-drop-of-system-java.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/repo/apps/chromium/chromium-revert-drop-of-system-java.patch b/repo/apps/chromium/chromium-revert-drop-of-system-java.patch new file mode 100644 index 0000000..117a50f --- /dev/null +++ b/repo/apps/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 |