Bug 1620744 - Convert jar_maker action to py3; r=firefox-build-system…

…-reviewers,rstewart Differential Revision: https://phabricator.services.mozilla.com/D65857
iaxat · Mar 10, 2020 · 74fc089 · 74fc089
1 parent eaf5440
commit 74fc089
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/config/rules.mk b/config/rules.mk
@@ -936,7 +936,7 @@ endif
 endif
 
 libs realchrome:: $(FINAL_TARGET)/chrome
-	$(call py_action,jar_maker,\
+	$(call py3_action,jar_maker,\
 	  $(QUIET) -d $(FINAL_TARGET) \
 	  $(MAKE_JARS_FLAGS) $(DEFINES) $(ACDEFINES) \
 	  $(JAR_MANIFEST))

diff --git a/python/mozbuild/mozbuild/jar.py b/python/mozbuild/mozbuild/jar.py
@@ -49,7 +49,7 @@ def __init__(self, name, zipfile):
     def write(self, content):
         '''Append the given content to this zip entry'''
 
-        self._inner.write(content)
+        self._inner.write(ensure_bytes(content))
         return
 
     def close(self):