Fix official build in GN

third_party/widevine/cdm/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/features.gni")
+import("//chrome/version.gni")

[ddorwin, 2015/02/25 01:18:32]

Same TODO?

+import("//media/cdm/ppapi/cdm_adapter.gni")
+
 widevine_arch = current_cpu
 if (widevine_arch == "x86") {
   widevine_arch = "ia32"
 }
 
 if (is_android) {
   # Always available on Android regardless of branding.
   widevine_cdm_version_h_file = "android/widevine_cdm_version.h"
   widevine_cdm_binary_files = []
 } else if (is_chrome_branded) {
@@ skipping 48 matching lines @@
     sources = widevine_cdm_binary_files
     outputs = [
       "$root_out_dir/{{source_file_part}}",
     ]
 
     # TODO(GYP)
     # 'COPY_PHASE_STRIP': 'NO',
   }
 }
 
-source_set("adapter") {
-  if (is_chrome_branded) {
+if (is_chrome_branded && enable_pepper_cdms) {
+  adapter_resource_file = "$target_gen_dir/widevinecdmadapter_version.rc"
+
+  # Produce the .rc file.
+  process_version("adapter_resources") {
+    visibility = [ ":*" ]

[ddorwin, 2015/02/25 01:18:32]

This is not in the clearkey BUILD.gn. Why do we need it here?

[brettw, 2015/02/25 01:32:42]

Just nice hygiene. I added it in the other place.

+    sources = [
+      "BRANDING",
+      "widevinecdmadapter.ver",
+    ]
+    output = adapter_resource_file
+  }
+
+  cdm_adapter("adapter") {
+    sources = [
+      adapter_resource_file,
+    ]
     deps = [
+      ":adapter_resources",
+      ":binaries",
       ":version_h",
-      ":binaries",
       "//ppapi/cpp",
-
-      #'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',  TODO(GYP)
     ]
+    libs = [ "rt" ]

[ddorwin, 2015/02/25 01:18:32]

The GYP file only did this on Linux. Is this a nop on other platforms?

[brettw, 2015/02/25 01:32:42]

Good catch

 
     if (is_linux) {
-      libs = [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ]
+      ldflags =
+          [ rebase_path("$root_out_dir/libwidevinecdm.so", root_build_dir) ]
     } else if (is_win) {
-      libs =
+      ldflags =
           [ rebase_path("$root_out_dir/widevinecdm.dll.lib", root_build_dir) ]
     } else if (is_mac) {
-      libs =
+      ldflags =
           [ rebase_path("$root_out_dir/libwidevinecdm.dylib", root_build_dir) ]
     }
   }
+} else {
+  # Placeholder when we're not compiling the adapter.
+  group("adapter") {

[ddorwin, 2015/02/25 01:18:32]

I assume this is the equivalent of 'type': 'none' in GYP.

[brettw, 2015/02/25 01:32:42]

Yes

+  }
 }
 
 # This target exists for tests to depend on that pulls in a runtime dependency
 # on the license server.
 source_set("widevine_test_license_server") {
   if (is_chrome_branded && is_linux) {
     deps = [
       # TODO(GYP)
       # This target should be removed and targets should have datadeps on this target:
       #"//third_party/widevine/test/license_server/license_server.gyp:test_license_server"
     ]
   }
 }