Bug 1075199 - Output a different clearkey.info depending on platform - r=cpearce,gps a=lmandel
authorEdwin Flores <eflores@mozilla.com>
Tue, 03 Feb 2015 16:59:39 +1300
changeset 250194 c197f7371955
parent 250193 ed78f124783d
child 250195 88ab5bafc85a
push id4521
push usercpearce@mozilla.com
push date2015-03-04 01:22 +0000
treeherdermozilla-beta@8abdbdecd2d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce, gps, lmandel
bugs1075199
milestone37.0
Bug 1075199 - Output a different clearkey.info depending on platform - r=cpearce,gps a=lmandel
media/gmp-clearkey/0.1/Makefile.in
media/gmp-clearkey/0.1/clearkey.info
media/gmp-clearkey/0.1/clearkey.info.in
--- a/media/gmp-clearkey/0.1/Makefile.in
+++ b/media/gmp-clearkey/0.1/Makefile.in
@@ -1,10 +1,10 @@
 # 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/.
 
-INSTALL_TARGETS += CLEARKEY_CDM
+CLEARKEY_CDM_PATH := $(DEPTH)/dist/bin/gmp-clearkey/0.1
+CLEARKEY_CDM := \
+  clearkey.info.in \
+  $(NULL)
 
-CLEARKEY_CDM_DEST = $(DEPTH)/dist/bin/gmp-clearkey/0.1
-CLEARKEY_CDM_FILES = \
-  clearkey.info \
-  $(NULL)
+PP_TARGETS := CLEARKEY_CDM
rename from media/gmp-clearkey/0.1/clearkey.info
rename to media/gmp-clearkey/0.1/clearkey.info.in
--- a/media/gmp-clearkey/0.1/clearkey.info
+++ b/media/gmp-clearkey/0.1/clearkey.info.in
@@ -1,5 +1,10 @@
 Name: clearkey
 Description: ClearKey decrypt-only GMP plugin
 Version: 0.1
+#ifdef ENABLE_WMF
 APIs: eme-decrypt-v6[org.w3.clearkey], decode-audio[aac:org.w3.clearkey], decode-video[h264:org.w3.clearkey]
 Libraries: dxva2.dll, d3d9.dll, msmpeg2vdec.dll, msmpeg2adec.dll, MSAudDecMFT.dll
+#else
+APIs: eme-decrypt-v6[org.w3.clearkey]
+Libraries:
+#endif