Fixing BND OSGI wrapp for Bazel build.
Change-Id: I7d70f79eb7ce79e5cca65659e096062fb469f18c
diff --git a/tools/build/bazel/osgi_java_library.bzl b/tools/build/bazel/osgi_java_library.bzl
index 7df0ec8..03913f4 100644
--- a/tools/build/bazel/osgi_java_library.bzl
+++ b/tools/build/bazel/osgi_java_library.bzl
@@ -86,23 +86,11 @@
for dep in ctx.attr.deps:
if java_common.provider in dep:
file = dep.files.to_list()[0]
-
if cp:
cp += ":"
cp += file.path
inputDependencies = inputDependencies + [file]
- # extract the class files for use by bnd
- classes = ctx.actions.declare_file("classes" + ctx.label.name.replace("/", "-"))
- classesPath = classes.path
- jarCommand = "mkdir -p %s && cp %s %s && cd %s && jar xf *.jar" % (classesPath, jar, classesPath, classesPath)
- ctx.actions.run_shell(
- inputs = inputDependencies,
- outputs = [classes],
- command = jarCommand,
- progress_message = "Expanding jar file: %s" % jar,
- )
- inputDependencies += [classes]
web_xml_root_path = ""
if len(web_xml) != 0:
web_xml_root = web_xml[0].files.to_list()[0]
@@ -124,7 +112,7 @@
web_context,
web_xml_root_path,
dynamicimportPackages,
- classesPath,
+ "classes",
bundle_classpath,
]