aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-11-08 09:42:41 -0800
committerGitHub <noreply@github.com>2018-11-08 09:42:41 -0800
commit470b3b5121564fd906c76436219eeba03f6bc76d (patch)
tree1d3b669e47a06700fcfb329fe2168dfbe3308d82 /mesonbuild/backend/ninjabackend.py
parent1d60a6a2edb36632136db8f3547577838bca6a4c (diff)
parent9294fd23be8d691ccbf41dbef1b39772e03c1eda (diff)
downloadmeson-470b3b5121564fd906c76436219eeba03f6bc76d.zip
meson-470b3b5121564fd906c76436219eeba03f6bc76d.tar.gz
meson-470b3b5121564fd906c76436219eeba03f6bc76d.tar.bz2
Merge pull request #4488 from dcbaker/java-fixes
Java fixes
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 9e76c5b..5606c41 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -877,6 +877,10 @@ int dummy;
def generate_single_java_compile(self, src, target, compiler, outfile):
deps = [os.path.join(self.get_target_dir(l), l.get_filename()) for l in target.link_targets]
+ generated_sources = self.get_target_generated_sources(target)
+ for rel_src, gensrc in generated_sources.items():
+ if rel_src.endswith('.java'):
+ deps.append(rel_src)
args = []
args += compiler.get_buildtype_args(self.get_option_for_target('buildtype', target))
args += self.build.get_global_args(compiler, target.is_cross)