Bug 1440435 - Remove final remnant of Java JAR building from Makefiles. r?Build draft
authorNick Alexander <nalexander@mozilla.com>
Fri, 18 May 2018 11:23:00 -0700
changeset 799453 75e4196209c648e2e575553c9639ef1a608a0351
parent 799392 ff8505d177b9fcba44b040ccd9b6bb709e238e84
child 799462 535463ebaadced8d683d3e0f133acddec00b4b47
child 799615 9467f7826d0dc8fb76de9e7dc54eb7c4a4f4bb78
push id111059
push usernalexander@mozilla.com
push dateThu, 24 May 2018 17:43:05 +0000
reviewersBuild
bugs1440435
milestone62.0a1
Bug 1440435 - Remove final remnant of Java JAR building from Makefiles. r?Build MozReview-Commit-ID: 2IrNI8a15Jh
python/mozbuild/mozbuild/backend/recursivemake.py
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -1227,33 +1227,16 @@ class RecursiveMakeBackend(CommonBackend
         for flag in per_source_flag.flags:
             backend_file.write('%s_FLAGS += %s\n' % (mozpath.basename(per_source_flag.file_name), flag))
 
     def _process_computed_flags(self, computed_flags, backend_file):
         for var, flags in computed_flags.get_flags():
             backend_file.write('COMPUTED_%s += %s\n' % (var,
                                                         ' '.join(make_quote(shell_quote(f)) for f in flags)))
 
-    def _process_java_jar_data(self, jar, backend_file):
-        target = jar.name
-        backend_file.write('JAVA_JAR_TARGETS += %s\n' % target)
-        backend_file.write('%s_DEST := %s.jar\n' % (target, jar.name))
-        if jar.sources:
-            backend_file.write('%s_JAVAFILES := %s\n' %
-                (target, ' '.join(jar.sources)))
-        if jar.generated_sources:
-            backend_file.write('%s_PP_JAVAFILES := %s\n' %
-                (target, ' '.join(jar.generated_sources)))
-        if jar.extra_jars:
-            backend_file.write('%s_EXTRA_JARS := %s\n' %
-                (target, ' '.join(sorted(set(jar.extra_jars)))))
-        if jar.javac_flags:
-            backend_file.write('%s_JAVAC_FLAGS := %s\n' %
-                (target, ' '.join(jar.javac_flags)))
-
     def _process_shared_library(self, libdef, backend_file):
         backend_file.write_once('LIBRARY_NAME := %s\n' % libdef.basename)
         backend_file.write('FORCE_SHARED_LIB := 1\n')
         backend_file.write('IMPORT_LIBRARY := %s\n' % libdef.import_name)
         backend_file.write('SHARED_LIBRARY := %s\n' % libdef.lib_name)
         if libdef.soname:
             backend_file.write('DSO_SONAME := %s\n' % libdef.soname)
         if libdef.symbols_file: