mirror of
https://abf.rosa.ru/djam/chromium-browser-stable.git
synced 2025-02-23 14:42:49 +00:00
29 lines
2.6 KiB
Diff
29 lines
2.6 KiB
Diff
Workaround build failure
|
|
|
|
DEBUG: FAILED: gen/mojo/public/js/mojo_bindings_lite.js
|
|
DEBUG: /usr/bin/python2 ../../third_party/closure_compiler/js_binary.py --compiler ../../third_party/closure_compiler/compiler/compiler.jar --output gen/mojo/public/js/mojo_bindings_lite.js --deps gen/mojo/public/js/bindings_lite_sources.js_library --sources --flags jscomp_error=accessControls jscomp_error=checkTypes jscomp_error=checkVars jscomp_error=constantProperty jscomp_error=deprecated jscomp_error=externsValidation jscomp_error=globalThis jscomp_error=invalidCasts jscomp_error=misplacedTypeAnnotation jscomp_error=missingProperties jscomp_error=missingReturn jscomp_error=nonStandardJsDocs jscomp_error=suspiciousCode jscomp_error=undefinedNames jscomp_error=undefinedVars jscomp_error=unknownDefines jscomp_error=uselessCode jscomp_error=visibility compilation_level=ADVANCED_OPTIMIZATIONS language_in=ECMASCRIPT_2017 language_out=ECMASCRIPT_2015 generate_exports export_local_property_definitions isolation_mode=IIFE js_module_root=../../ui/webui/resources/ js_module_root=gen/ui/webui/resources/ module_resolution=BROWSER_WITH_TRANSFORMED_PREFIXES browser_resolver_prefix_replacements=\"chrome://resources/=./\" browser_resolver_prefix_replacements=\"//resources/=./\" --externs ../../third_party/closure_compiler/externs/chrome.js ../../third_party/closure_compiler/externs/polymer-1.0.js ../../third_party/closure_compiler/externs/mojo_core.js
|
|
DEBUG: Traceback (most recent call last):
|
|
DEBUG: File "../../third_party/closure_compiler/js_binary.py", line 20, in <module>
|
|
DEBUG: import compiler
|
|
DEBUG: File "/builddir/build/BUILD/chromium-91.0.4472.77/third_party/closure_compiler/compiler.py", line 17, in <module>
|
|
DEBUG: assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
|
|
DEBUG: AssertionError: java only allowed in android builds
|
|
|
|
DEBUG: /bin/sh: /builddir/build/BUILD/chromium-91.0.4472.77/third_party/closure_compiler/../jdk/current/bin/java: No such file or directory
|
|
so hardcode path
|
|
|
|
Reported to upstream:
|
|
https://bugs.chromium.org/p/chromium/issues/detail?id=1214022
|
|
|
|
--- a/third_party/closure_compiler/compiler.py.orig 2021-05-27 21:01:57.998956433 +0300
|
|
+++ b/third_party/closure_compiler/compiler.py 2021-05-27 21:33:56.035526231 +0300
|
|
@@ -13,8 +13,7 @@
|
|
|
|
|
|
_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_PATH = "/usr/bin/java"
|
|
|
|
class Compiler(object):
|
|
"""Runs the Closure compiler on given source files to typecheck them
|