[COMMIT osv master] module.py: do not resolve java-base for non-java apps

3 views
Skip to first unread message

Commit Bot

unread,
Apr 10, 2020, 5:29:00 PM4/10/20
to osv...@googlegroups.com, Waldemar Kozaczuk
From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Waldemar Kozaczuk <jwkoz...@gmail.com>
Branch: master

module.py: do not resolve java-base for non-java apps

This reduces a little bit of noise by making build not resolve
java-base and related modules for non-java apps.

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>

---
diff --git a/scripts/module.py b/scripts/module.py
--- a/scripts/module.py
+++ b/scripts/module.py
@@ -132,16 +132,15 @@ def flatten_list(elememnts):

def get_basic_apps(apps):
basic_apps = []
- java = resolve.require('java-base')
- if hasattr(java,'non_isolated_jvm') and java.non_isolated_jvm:
- _jvm = non_isolated_jvm()
- else:
- _jvm = isolated_jvm()
+ _jvm = isolated_jvm()

for app in flatten_list(apps):
if isinstance(app, api.basic_app):
basic_apps.append(app)
elif isinstance(app, api.java_app):
+ java = resolve.require('java-base')
+ if hasattr(java,'non_isolated_jvm') and java.non_isolated_jvm:
+ _jvm = non_isolated_jvm()
_jvm.add(app)
else:
raise Exception("Unknown app type: " + str(app))
Reply all
Reply to author
Forward
0 new messages