diff options
| author | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 00:58:47 +0000 |
|---|---|---|
| committer | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-19 00:58:47 +0000 |
| commit | 452f2e9d7c9325480e5c7bcbc3b6739f3b20903b (patch) | |
| tree | 8f8e5343f4c685d7af1836f7eefc40127201cd50 /android_webview/test | |
| parent | 913bd0ace4f561862381c5ffc831a88f0222bc1b (diff) | |
| download | chromium_src-452f2e9d7c9325480e5c7bcbc3b6739f3b20903b.zip chromium_src-452f2e9d7c9325480e5c7bcbc3b6739f3b20903b.tar.gz chromium_src-452f2e9d7c9325480e5c7bcbc3b6739f3b20903b.tar.bz2 | |
aw: Support the platform specific key-systems.
BUG=322395
Change-Id: Ie0376052892349f18db5d60737f6329b8c92eb1c
Review URL: https://codereview.chromium.org/333003003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/test')
| -rw-r--r-- | android_webview/test/shell/res/values/config.xml | 13 | ||||
| -rw-r--r-- | android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/android_webview/test/shell/res/values/config.xml b/android_webview/test/shell/res/values/config.xml new file mode 100644 index 0000000..d875170 --- /dev/null +++ b/android_webview/test/shell/res/values/config.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright 2014 The Chromium Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. +--> + +<resources> + <!-- Array of "[keySystemName],[UuidOfMediaDrm]" --> + <string-array name="config_key_system_uuid_mapping" translatable="false"> + <!-- Use Widevine's UUID to pass the availability-test of MediaDRM plugin --> + <item>"com.oem.test-keysystem,EDEF8BA9-79D6-4ACE-A3C8-27DCD51D21ED"</item> + </string-array> +</resources> diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java index bfc8125..d086fe1 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java @@ -25,6 +25,8 @@ public class AwShellResourceProvider { AwResource.setDefaultTextEncoding(R.string.default_encoding); + AwResource.setConfigKeySystemUuidMapping(R.array.config_key_system_uuid_mapping); + sInitialized = true; } } |