Bug 1135320 - Re-enable voucher.bin generation on Win64 - r=cpearce
authorEdwin Flores <edwin@mozilla.com>
Thu, 13 Aug 2015 16:08:46 -0700
changeset 257519 7d6edef7f2424f51be3b1539925c8caaea3effd7
parent 257518 948b2e9d1fa282b3acd35a67e6b020b3e68510c7
child 257520 a920bf34b5766bf74cb8c995c31f157eec5eb5fe
push id63649
push usereflores@mozilla.com
push dateThu, 13 Aug 2015 04:08:58 +0000
treeherdermozilla-inbound@7d6edef7f242 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1135320
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1135320 - Re-enable voucher.bin generation on Win64 - r=cpearce
toolkit/mozapps/installer/make-eme.mk
--- a/toolkit/mozapps/installer/make-eme.mk
+++ b/toolkit/mozapps/installer/make-eme.mk
@@ -1,16 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk
 
 ifdef MOZ_SIGN_CMD
   ifeq ($(OS_ARCH),WINNT)
-    ifneq ($(TARGET_CPU),x86_64)
-      # The argument to this macro is the directory where plugin-container.exe
-      # exists, and where voucher.bin will be generated.
-      MAKE_SIGN_EME_VOUCHER = $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(1)/plugin-container.exe -output $(1)/voucher.bin && \
-        $(MOZ_SIGN_CMD) -f emevoucher "$(1)/voucher.bin"
-    endif
+    # The argument to this macro is the directory where plugin-container.exe
+    # exists, and where voucher.bin will be generated.
+    MAKE_SIGN_EME_VOUCHER = $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(1)/plugin-container.exe -output $(1)/voucher.bin && \
+      $(MOZ_SIGN_CMD) -f emevoucher "$(1)/voucher.bin"
   endif
 endif