Bug 1134913 - Disable EME plugin-container voucher generation on Win64. r=ted a=lmandel
authorChris Pearce <cpearce@mozilla.com>
Sat, 21 Feb 2015 16:43:52 +1300
changeset 250286 67df6f1dbe4f
parent 250285 b377c6a7858e
child 250287 620c8e250c76
push id4535
push usercpearce@mozilla.com
push date2015-03-06 20:57 +0000
treeherdermozilla-beta@68707623b5a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, lmandel
bugs1134913
milestone37.0
Bug 1134913 - Disable EME plugin-container voucher generation on Win64. r=ted a=lmandel
toolkit/mozapps/installer/make-eme.mk
--- a/toolkit/mozapps/installer/make-eme.mk
+++ b/toolkit/mozapps/installer/make-eme.mk
@@ -1,14 +1,16 @@
 # 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)
-    # 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"
+    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
   endif
 endif