diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/third_party/widevine | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/widevine')
| -rw-r--r-- | chromium/third_party/widevine/cdm/BUILD.gn | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/third_party/widevine/cdm/BUILD.gn b/chromium/third_party/widevine/cdm/BUILD.gn index 8a540f0ea2d..af0dd6c2723 100644 --- a/chromium/third_party/widevine/cdm/BUILD.gn +++ b/chromium/third_party/widevine/cdm/BUILD.gn @@ -5,7 +5,7 @@ import("//build/config/chrome_build.gni") import("//build/config/features.gni") import("//chrome/version.gni") # TODO layering violation -import("//media/cdm/ppapi/cdm_adapter.gni") +import("//media/cdm/ppapi/ppapi_cdm_adapter.gni") import("//third_party/widevine/cdm/widevine.gni") widevine_arch = current_cpu @@ -122,18 +122,18 @@ if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) { output = "$target_gen_dir/widevinecdmadapter_version.rc" } - cdm_adapter("widevinecdmadapter") { + ppapi_cdm_adapter("widevinecdmadapter") { + defines = [] deps = [ - ":widevinecdmadapter_resources", - ":widevinecdm", ":version_h", + ":widevinecdm", + ":widevinecdmadapter_resources", "//ppapi/cpp", ] if (is_linux) { ldflags = [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ] - libs = [ "rt" ] } else if (is_win) { ldflags = [ rebase_path("$root_out_dir/widevinecdm.dll.lib", root_build_dir) ] |