media: Use platform specific folders for CDMs

chrome/installer/mini_installer/chrome.release

Index: chrome/installer/mini_installer/chrome.release
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 1816869d3cafcaf4fcfad85cd88ea422932e615c..ea6af83801fb6c94befc722ff723a7d84f3ce8d0 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -55,7 +55,10 @@ chrome_material_200_percent.pak: %(VersionDir)s\
 
 [GOOGLE_CHROME]
 SecondaryTile.png: %(VersionDir)s\
-widevinecdmadapter.dll: %(VersionDir)s\
+#
+# Widevine CDM sub-dir
+#
+WidevineCdm\_platform_specific\*\widevinecdmadapter.dll: %(VersionDir)s\WidevineCdm\_platform_specific\win_%(Arch)s\

[ddorwin, 2016/05/20 04:08:56]

'*': You accept _any_/_all_ directories? What if you have built both ia32 and
x64? Will $(Arch) not work?

[xhwang, 2016/05/20 07:18:19]

+gab

It seems the "key" doesn't support "interpolations" [1] :( So this is pretty
much the best I can have.

I just noted that we have both nacl_irt_x86_32.nexe and nacl_irt_x86_64.nexe
above. Does this mean we can actually put files on different "arch" here in this
list, and we'll pick what ever is available? If so, we actually don't need the
%(Arch)s here, and can just hard code both cases here, e.g.

WidevineCdm\_platform_specific\win_x64\widevinecdmadapter.dll:
%(VersionDir)s\Widevine
    Cdm\_platform_specific\win_x64\
WidevineCdm\_platform_specific\win_x86\widevinecdmadapter.dll:
%(VersionDir)s\Widevine
    Cdm\_platform_specific\win_x86\

This doesn't solve the corss-compile-using-same-folder issue, but that'll also
happen for nacl.

[1] https://docs.python.org/2/library/configparser.html

On top of the core functionality, SafeConfigParser supports interpolation. This
means VALUES can contain format strings which refer to other values in the same
section, or values in a special DEFAULT section. Additional defaults can be
provided on initialization.

[xhwang, 2016/05/20 07:20:25]

I tried it and it seems to be working. This will at least prevent copying the
wrong file into a platform specific folder. In the worst case (building 32/64 in
the same folder) we'll have both folders picked up, and only the right one will
be used at run time.

 #
 # Pepper Flash sub-dir.
 #