summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD.gn1
-rw-r--r--chrome/common/BUILD.gn10
-rw-r--r--content/BUILD.gn5
-rw-r--r--content/child/BUILD.gn2
-rw-r--r--content/common/BUILD.gn26
-rw-r--r--content/public/renderer/BUILD.gn2
-rw-r--r--content/renderer/BUILD.gn5
-rw-r--r--extensions/BUILD.gn25
-rw-r--r--extensions/extensions_strings.gyp1
-rw-r--r--extensions/strings/BUILD.gn13
-rw-r--r--third_party/widevine/cdm/BUILD.gn102
-rw-r--r--third_party/widevine/cdm/widevine_cdm.gyp3
-rw-r--r--webkit/common/BUILD.gn1
-rw-r--r--webkit/common/webkit_common.gyp1
14 files changed, 167 insertions, 30 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 8891c61..e420bf2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -68,6 +68,7 @@ group("root") {
"//third_party/smhasher:pmurhash",
"//third_party/speex",
"//third_party/WebKit/public:all_blink",
+ "//third_party/widevine/cdm:version_h",
"//third_party/zlib",
"//third_party:jpeg",
"//tools/gn",
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index f6d2a81..13fb84d 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -51,8 +51,8 @@ static_library("common") {
#"//components/variations", TODO(GYP)
"//content/public/common",
"//crypto",
- #"//extensions/extensions_resources.gyp:extensions_resources", TODO(GYP)
- #"//extensions/extensions_strings.gyp:extensions_strings", TODO(GYP)
+ "//extensions:extensions_resources",
+ "//extensions/strings",
#"//media/cast/cast.gyp:cast_transport", TODO(GYP)
"//net",
"//skia",
@@ -131,16 +131,12 @@ static_library("constants") {
"widevine_cdm_constants.h",
]
- # TODO(GYP) remove when widevine is supported for real.
- configs += [ "//content:widevine_stub_config" ]
-
deps = [
"//base",
"//base/third_party/dynamic_annotations",
+ "//third_party/widevine/cdm:version_h",
# TODO(GYP)
#'../components/components.gyp:bookmarks_common',
#'../components/nacl.gyp:nacl_switches',
- #'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
- # (Also see widevine config above.)
]
}
diff --git a/content/BUILD.gn b/content/BUILD.gn
index b4f81b3..20a553e 100644
--- a/content/BUILD.gn
+++ b/content/BUILD.gn
@@ -94,11 +94,6 @@ config("libjingle_stub_config") {
}
}
-config("widevine_stub_config") {
- # The real implementation does a copy rule to copy the header to the gen dir.
- include_dirs = [ "//third_party/widevine/cdm" ]
-}
-
# Sets up include dirs while webrtc is being converted to GN.
# TODO(GYP) remove when webrtc is ready.
config("webrtc_stub_config") {
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 618de03..bf3a43a 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -17,6 +17,7 @@ source_set("child") {
deps = [
"//base",
"//components/tracing",
+ "//mojo/environment:chromium",
"//mojo/public/interfaces/service_provider",
"//skia",
"//third_party/icu",
@@ -24,7 +25,6 @@ source_set("child") {
"//ui/gfx",
"//ui/gfx/geometry",
"//url",
- #'../mojo/mojo.gyp:mojo_environment_chromium', # TODO(GYP)
]
if (!use_default_render_theme) {
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 88890f0..511027e 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -45,26 +45,27 @@ source_set("common") {
if (!is_ios) {
deps += [
+ "//cc",
"//ipc",
+ "//mojo/environment:chromium",
+ "//mojo/system",
+ # TODO: the dependency on gl_in_process_context should be decoupled from
+ # content and moved to android_webview. See crbug.com/365797.
+ "//gpu/command_buffer/client:gl_in_process_context",
"//gpu/command_buffer/client:gles2_c_lib",
"//gpu/command_buffer/client:gles2_implementation",
+ "//gpu/command_buffer/service",
+ "//gpu/ipc",
"//ui/gl",
- #'../cc/cc.gyp:cc',
- #'../gpu/gpu.gyp:command_buffer_service',
- # TODO: the dependency on gl_in_process_context should be decoupled from
- # content and moved to android_webview. See crbug.com/365797.
+ "//webkit/browser:storage",
+ "//webkit/common",
+ "//webkit/common:storage",
+ "//webkit/common/gpu",
#'../gpu/gpu.gyp:gl_in_process_context',
- #'../gpu/gpu.gyp:gpu_ipc',
#'../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
#'../media/media.gyp:media',
#'../media/media.gyp:shared_memory_support',
- #'../mojo/mojo.gyp:mojo_environment_chromium',
- #'../mojo/mojo.gyp:mojo_system_impl',
#'../third_party/WebKit/public/blink.gyp:blink',
- #'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
- #'../webkit/common/webkit_common.gyp:webkit_common',
- #'../webkit/storage_browser.gyp:webkit_storage_browser',
- #'../webkit/storage_common.gyp:webkit_storage_common',
]
}
@@ -156,8 +157,7 @@ source_set("common") {
if (enable_plugins) {
deps += [
- # TODO(GYP) enable once supported in the GN build.
- #"//ppapi:shared",
+ "//ppapi:ppapi_shared",
]
} else {
sources -= [
diff --git a/content/public/renderer/BUILD.gn b/content/public/renderer/BUILD.gn
index 7e0bd4f..4140205 100644
--- a/content/public/renderer/BUILD.gn
+++ b/content/public/renderer/BUILD.gn
@@ -12,13 +12,13 @@ source_set("renderer") {
configs += [
"//content:content_implementation",
"//content:libjingle_stub_config",
- "//content:widevine_stub_config",
]
deps = [
"//content/renderer",
"//skia",
"//third_party/WebKit/public:blink_headers",
+ "//third_party/widevine/cdm:version_h",
"//v8",
]
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index d675a1e..4dde197 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -16,7 +16,6 @@ source_set("renderer") {
configs += [
"//content:content_implementation",
"//content:libjingle_stub_config",
- "//content:widevine_stub_config",
]
deps = [
@@ -28,6 +27,7 @@ source_set("renderer") {
"//content:resources",
"//content/common:mojo_bindings",
"//gin",
+ "//mojo/environment:chromium",
"//mojo/public/js/bindings",
"//mojo/public/interfaces/service_provider",
"//net",
@@ -35,6 +35,7 @@ source_set("renderer") {
"//third_party/icu",
"//third_party/npapi",
"//third_party/WebKit/public:blink_headers",
+ "//third_party/widevine/cdm:version_h",
"//ui/accessibility",
"//ui/events:dom4_keycode_converter",
"//ui/native_theme",
@@ -47,10 +48,8 @@ source_set("renderer") {
# TODO(GYP)
#'../jingle/jingle.gyp:jingle_glue',
#'../media/media.gyp:media',
- #'../mojo/mojo.gyp:mojo_environment_chromium',
#'../third_party/WebKit/public/blink.gyp:blink',
#'../third_party/libjingle/libjingle.gyp:libjingle',
- #'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
]
if (!enable_notifications) {
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
new file mode 100644
index 0000000..47b4769
--- /dev/null
+++ b/extensions/BUILD.gn
@@ -0,0 +1,25 @@
+# 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("//tools/grit/grit_rule.gni")
+
+# GYP version: extensions/extensions_resources.gyp:extensions_resources
+group("extensions_resources") {
+ deps = [
+ ":extensions_renderer_resources",
+ ":extensions_resources_grd",
+ ]
+}
+
+# GYP version: extensions/extensions_resources.gyp:extensions_resources
+# (exntensions_resources action)
+grit("extensions_resources_grd") {
+ source = "extensions_resources.grd"
+}
+
+# GYP version: extensions/extensions_resources.gyp:extensions_resources
+# (exntensions_renderer_resources action)
+grit("extensions_renderer_resources") {
+ source = "renderer/resources/extensions_renderer_resources.grd"
+}
diff --git a/extensions/extensions_strings.gyp b/extensions/extensions_strings.gyp
index abbf167..3adaeb2 100644
--- a/extensions/extensions_strings.gyp
+++ b/extensions/extensions_strings.gyp
@@ -5,6 +5,7 @@
{
'targets': [
{
+ # GN version: //extensions:strings
'target_name': 'extensions_strings',
'type': 'none',
'actions': [
diff --git a/extensions/strings/BUILD.gn b/extensions/strings/BUILD.gn
new file mode 100644
index 0000000..bdbca60
--- /dev/null
+++ b/extensions/strings/BUILD.gn
@@ -0,0 +1,13 @@
+# 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("//tools/grit/grit_rule.gni")
+
+# GYP version: extensions/extensions_strings.gyp:extensions_strings
+grit("strings") {
+ # This target is in this directory since it matches the output grit path for
+ # the GYP version of this target. Weirdly, it does not match the input path.
+ # The .grd should probably be moved here.
+ source = "../extensions_strings.grd"
+}
diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
new file mode 100644
index 0000000..79fad228
--- /dev/null
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -0,0 +1,102 @@
+# 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.
+
+widevine_arch = cpu_arch
+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) {
+ if (is_chromeos) {
+ widevine_cdm_version_h_file =
+ "chromeos/$widevine_arch/widevine_cdm_version.h"
+ widevine_cdm_binary_files = [
+ "chromeos/$widevine_arch/libwidevinecdm.so",
+ ]
+ } else if (is_linux) {
+ widevine_cdm_version_h_file =
+ "linux/$widevine_arch/widevine_cdm_version.h"
+ widevine_cdm_binary_files = [
+ "linux/$widevine_arch/libwidevinecdm.so",
+ ]
+ } else if (is_win) {
+ widevine_cdm_version_h_file =
+ "win/$widevine_arch/widevine_cdm_version.h"
+ widevine_cdm_binary_files = [
+ "win/$widevine_arch/widevinecdm.dll",
+ "win/$widevine_arch/widevinecdm.dll.lib",
+ ]
+ } else if (is_mac) {
+ widevine_cdm_version_h_file =
+ "mac/$widevine_arch/widevine_cdm_version.h"
+ widevine_cdm_binary_files = [
+ "mac/$widevine_arch/libwidevinecdm.dylib",
+ ]
+ } else {
+ # Other platforms, use the default one.
+ widevine_cdm_version_h_file = "widevine_cdm_version.h"
+ widevine_cdm_binary_files = []
+ }
+} else {
+ # No branding, use the default one.
+ widevine_cdm_version_h_file = "widevine_cdm_version.h"
+ widevine_cdm_binary_files = []
+}
+
+# GYP version: third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h
+copy("version_h") {
+ sources = [ widevine_cdm_version_h_file ]
+ # TODO(brettw) this should go into target_out_dir and callers should include
+ # it from there. This requires, however, renaming the default
+ # widevine_cdm_version.h in this directory to avoid conflicts.
+ outputs = [ "$root_gen_dir/widevine_cdm_version.h" ]
+}
+
+# GYP version: third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_binaries
+if (widevine_cdm_binary_files == []) {
+ group("binaries") {
+ # NOP
+ }
+} else {
+ copy("binaries") {
+ 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) {
+ deps = [
+ ":widevine_cdm_version_h",
+ ":widevine_cdm_binaries",
+ "//ppapi:ppapi_cpp",
+ #'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter', TODO(GYP)
+ ]
+ }
+
+ if (is_linux) {
+ libs = [ "$root_out_dir/libwidevinecdm.sp" ]
+ } else if (is_win) {
+ libs = [ "$root_out_dir/widevinecdm.dll.lib" ]
+ } else if (is_mac) {
+ libs = [ "$root_out_dir/libwidevinecdm.dylib" ]
+ }
+}
+
+# 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)
+ #"//third_party/widevine/test/license_server/license_server.gyp:test_license_server"
+ ]
+ }
+}
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index 674038b..48896c1 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -50,6 +50,7 @@
# anything to be done in this file (instead of a higher-level .gyp file).
'targets': [
{
+ # GN version: //third_party/widevine/cdm:adapter
'target_name': 'widevinecdmadapter',
'type': 'none',
'conditions': [
@@ -84,6 +85,7 @@
],
},
{
+ # GN version: //third_party/widevine/cdm:version_h
'target_name': 'widevine_cdm_version_h',
'type': 'none',
'copies': [{
@@ -92,6 +94,7 @@
}],
},
{
+ # GN version: //third_party/widevine/cdm:binaries
'target_name': 'widevine_cdm_binaries',
'type': 'none',
'conditions': [
diff --git a/webkit/common/BUILD.gn b/webkit/common/BUILD.gn
index 127af7e..011a1eb 100644
--- a/webkit/common/BUILD.gn
+++ b/webkit/common/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# GYP version: webkit/common/webkit_common.gyp:webkit_common
component("common") {
output_name = "webkit_common"
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index bdf1698..5e3e8b8 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -9,6 +9,7 @@
},
'targets': [
{
+ # GN version: //webkit/common:common",
'target_name': 'webkit_common',
'type': '<(component)',
'defines': [
generated by cgit v1.1 at 2025-01-08 03:29:08 +0000