Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1505)

Unified Diff: media/cdm/ppapi/BUILD.gn

Issue 1276973003: GN: Make clearkeycdm a data_dep for clearkeycdmadapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move changes to cdm_adapter.gni Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_adapter.gni » ('j') | media/cdm/ppapi/cdm_adapter.gni » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/BUILD.gn
diff --git a/media/cdm/ppapi/BUILD.gn b/media/cdm/ppapi/BUILD.gn
index 585e6bf00a205457e16d0a0e4430d29b6e7e289e..cd10c8342fbb41ca77d75da63fa1bd7df6e2d158 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,4 @@ cdm_adapter("clearkeycdmadapter") {
":clearkeycdmadapter_resources",
"//ppapi/cpp",
]
-
- if (is_posix && !is_mac && enable_pepper_cdms) {
- # Because clearkeycdm has type 'loadable_module', we must explicitly
- # specify this dependency.
- ldflags = [ rebase_path("$root_out_dir/libclearkeycdm.so", root_build_dir) ]
- libs = [ "rt" ]
- }
}
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_adapter.gni » ('j') | media/cdm/ppapi/cdm_adapter.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698