Chromium Code Reviews| Index: media/cdm/ppapi/BUILD.gn |
| diff --git a/media/cdm/ppapi/BUILD.gn b/media/cdm/ppapi/BUILD.gn |
| index 585e6bf00a205457e16d0a0e4430d29b6e7e289e..285a8e696a7ad5b4adf9c929cc717d96bd4bd88d 100644 |
| --- a/media/cdm/ppapi/BUILD.gn |
| +++ b/media/cdm/ppapi/BUILD.gn |
| @@ -55,7 +55,7 @@ process_version("clearkeycdmadapter_resources") { |
| "//media/clearkeycdmadapter.ver", |
| "external_clear_key/BRANDING", |
| ] |
| - output = "$target_gen_dir/clearkeycdmadapter_version.rc" |
| + output = "$target_gen_dir/clearkeycdmadapter_version.rc" |
| } |
| cdm_adapter("clearkeycdmadapter") { |
| @@ -66,11 +66,5 @@ cdm_adapter("clearkeycdmadapter") { |
| ":clearkeycdmadapter_resources", |
| "//ppapi/cpp", |
| ] |
| - |
| - if (is_posix && !is_mac && enable_pepper_cdms) { |
| - # Because clearkeycdm has type 'loadable_module', we must explicitly |
|
brettw
2015/08/10 19:57:36
This old code is pretty confusing.
I *think* you
agrieve
2015/08/10 20:04:13
The presubmit failed, so could be that's what the
|
| - # specify this dependency. |
| - ldflags = [ rebase_path("$root_out_dir/libclearkeycdm.so", root_build_dir) ] |
| - libs = [ "rt" ] |
| - } |
| + data_deps = [ ":clearkeycdm" ] |
| } |