GN: Make clearkeycdm a data_dep for clearkeycdmadapter

media/cdm/ppapi/cdm_adapter.gni

Index: media/cdm/ppapi/cdm_adapter.gni
diff --git a/media/cdm/ppapi/cdm_adapter.gni b/media/cdm/ppapi/cdm_adapter.gni
index d5152ae2b16740afd4efdb0c53fd728ea3dac06c..e326903042fe769f5e46d1ce21e8bb758def2014 100644
--- a/media/cdm/ppapi/cdm_adapter.gni
+++ b/media/cdm/ppapi/cdm_adapter.gni
@@ -11,8 +11,13 @@ template("cdm_adapter") {
   shared_library(target_name) {
     # Don't filter sources list again.
     set_sources_assignment_filter([])
+    cflags = []
+    sources = []
+    ldflags = []
+    libs = []
+    forward_variables_from(invoker, "*")
 
-    sources = [
+    sources += [
       "//media/cdm/ppapi/api/content_decryption_module.h",
       "//media/cdm/ppapi/cdm_adapter.cc",
       "//media/cdm/ppapi/cdm_adapter.h",
@@ -26,101 +31,22 @@ template("cdm_adapter") {
       "//media/cdm/ppapi/linked_ptr.h",
       "//media/cdm/ppapi/supported_cdm_versions.h",
     ]
-    if (defined(invoker.sources)) {
-      sources += invoker.sources
-    }
-
     if (is_mac) {
-      ldflags = [
+      ldflags += [
         # Not to strip important symbols by -Wl,-dead_strip.
         "-Wl,-exported_symbol,_PPP_GetInterface",
         "-Wl,-exported_symbol,_PPP_InitializeModule",
         "-Wl,-exported_symbol,_PPP_ShutdownModule",
       ]
       #TODO(GYP) Mac: 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
-    } else if (is_posix && !is_mac) {
-      cflags = [ "-fvisibility=hidden" ]
-      # Note GYP sets rpath but this is set by default on shared libraries in
-      # the GN build.
+    } else if (is_posix) {

[brettw, 2015/08/11 01:28:02]

Just making sure you meant to remove the mac condition here.

[agrieve, 2015/08/11 13:53:04]

Yep - it's redundant since there's "if (is_mac) {" as the first condition.

+      cflags += [ "-fvisibility=hidden" ]
+
+      # Required for clock_gettime()
+      libs += [ "rt" ]
     }
 
     # TODO(jschuh) crbug.com/167187
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
-    if (defined(invoker.all_dependent_configs)) {
-      all_dependent_configs = invoker.all_dependent_configs
-    }
-    if (defined(invoker.allow_circular_includes_from)) {
-      allow_circular_includes_from = invoker.allow_circular_includes_from
-    }
-    if (defined(invoker.cflags)) {
-      cflags = invoker.cflags
-    }
-    if (defined(invoker.cflags_c)) {
-      cflags_c = invoker.cflags_c
-    }
-    if (defined(invoker.cflags_cc)) {
-      cflags_cc = invoker.cflags_cc
-    }
-    if (defined(invoker.cflags_objc)) {
-      cflags_objc = invoker.cflags_objc
-    }
-    if (defined(invoker.cflags_objcc)) {
-      cflags_objcc = invoker.cflags_objcc
-    }
-    if (defined(invoker.check_includes)) {
-      check_includes = invoker.check_includes
-    }
-    if (defined(invoker.data)) {
-      data = invoker.data
-    }
-    if (defined(invoker.data_deps)) {
-      data_deps = invoker.data_deps
-    }
-    if (defined(invoker.datadeps)) {
-      datadeps = invoker.datadeps
-    }
-    if (defined(invoker.defines)) {
-      defines = invoker.defines
-    }
-    if (defined(invoker.deps)) {
-      deps = invoker.deps
-    }
-    if (defined(invoker.forward_dependent_configs_from)) {
-      forward_dependent_configs_from = invoker.forward_dependent_configs_from
-    }
-    if (defined(invoker.include_dirs)) {
-      include_dirs = invoker.include_dirs
-    }
-    if (defined(invoker.ldflags)) {
-      ldflags = invoker.ldflags
-    }
-    if (defined(invoker.lib_dirs)) {
-      lib_dirs = invoker.lib_dirs
-    }
-    if (defined(invoker.libs)) {
-      libs = invoker.libs
-    }
-    if (defined(invoker.output_extension)) {
-      output_extension = invoker.output_extension
-    }
-    if (defined(invoker.output_name)) {
-      output_name = invoker.output_name
-    }
-    if (defined(invoker.public)) {
-      public = invoker.public
-    }
-    if (defined(invoker.public_configs)) {
-      public_configs = invoker.public_configs
-    }
-    if (defined(invoker.public_deps)) {
-      public_deps = invoker.public_deps
-    }
-    if (defined(invoker.testonly)) {
-      testonly = invoker.testonly
-    }
-    if (defined(invoker.visibility)) {
-      visibility = invoker.visibility
-    }
   }
 }