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

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

Issue 949233003: Fix official build in GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@random
Patch Set: Created 5 years, 10 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
Index: media/cdm/ppapi/BUILD.gn
diff --git a/media/cdm/ppapi/BUILD.gn b/media/cdm/ppapi/BUILD.gn
index 9a85bd3641e396b3a8a243ffc318298c9870ee97..2f05c6ac96c2030e3383280a5ff0c09202e117d1 100644
--- a/media/cdm/ppapi/BUILD.gn
+++ b/media/cdm/ppapi/BUILD.gn
@@ -3,6 +3,8 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//chrome/version.gni") # TODO layering violation!
+import("//media/cdm/ppapi/cdm_adapter.gni")
# Android doesn't use ffmpeg.
use_ffmpeg = !is_android
@@ -47,14 +49,35 @@ shared_library("clearkeycdm") {
# TODO(GYP) on Mac: 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
}
-# TODO(GYP): clearkeycdmadapter_resources
+clearkeycdmadapter_rc_file = "$target_gen_dir/clearkeycdmadapter_version.rc"
-group("clearkeycdmadapter") {
+process_version("clearkeycdmadapter_resources") {
+ sources = [
+ "external_clear_key/BRANDING",
+ "//media/clearkeycdmadapter.ver",
+ ]
+ output = clearkeycdmadapter_rc_file
+}
+
+cdm_adapter("clearkeycdmadapter") {
+ sources = [
+ clearkeycdmadapter_rc_file
+ ]
Dirk Pranke 2015/02/25 00:23:20 Nit: formatted correctly?
+
+ # Check whether the plugin's origin URL is valid.
+ defines = [ "CHECK_DOCUMENT_URL" ]
deps = [
- #":cdmadapter", TODO(GYP)
":clearkeycdm",
-
- #":clearkeycdmadapter_resources", TODO(GYP)
+ ":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" ]
+ }
}

Powered by Google App Engine
This is Rietveld 408576698