diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 05:26:59 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 05:26:59 +0000 |
commit | 8242888470877d61037bcf0e3a959db92989d728 (patch) | |
tree | 3538934b5a882da982601386daab0d808a49935f /extensions | |
parent | 883f42a0871d58be243e546fd9b9449822679599 (diff) | |
download | chromium_src-8242888470877d61037bcf0e3a959db92989d728.zip chromium_src-8242888470877d61037bcf0e3a959db92989d728.tar.gz chromium_src-8242888470877d61037bcf0e3a959db92989d728.tar.bz2 |
Add widevine and extensions resources to GN build.
Fix up some references in content and webkit for targets that now exist.
TBR=hclam@chromium.org
Review URL: https://codereview.chromium.org/344873006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/BUILD.gn | 25 | ||||
-rw-r--r-- | extensions/extensions_strings.gyp | 1 | ||||
-rw-r--r-- | extensions/strings/BUILD.gn | 13 |
3 files changed, 39 insertions, 0 deletions
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" +} |