summaryrefslogtreecommitdiffstats
path: root/mojo/apps/js
diff options
context:
space:
mode:
authorBrett Wilson <brettw@chromium.org>2014-09-19 15:56:00 -0700
committerBrett Wilson <brettw@chromium.org>2014-09-19 22:56:31 +0000
commite2311613971cf63c66b60ebea38b4592b8520b8f (patch)
treef85ca0fff4777f2aff850a721cc60fc17d49a7d9 /mojo/apps/js
parente9c0681418502c97e56472c4a554b2735e79b0f8 (diff)
downloadchromium_src-e2311613971cf63c66b60ebea38b4592b8520b8f.zip
chromium_src-e2311613971cf63c66b60ebea38b4592b8520b8f.tar.gz
chromium_src-e2311613971cf63c66b60ebea38b4592b8520b8f.tar.bz2
Make mojo/services pass in "gn check"
This mostly just adds the missing dependency identified by the checker. In some cases I looked at the target and added public_deps that I thought were appropriate given the nature of the target. This renames the generated mojo action names to be foo__generator instead of foo_generator since it is not clear from the current name that it is an internally-generated target and I kept trying to use it. The double-underscore matches the Android generated targets. In a few cases I changed ordering (sources come before deps in GN style) but I didn't want to make the changes difficult to diff so didn't do it for most cases. R=darin@chromium.org Review URL: https://codereview.chromium.org/581273003 Cr-Commit-Position: refs/heads/master@{#295797}
Diffstat (limited to 'mojo/apps/js')
-rw-r--r--mojo/apps/js/BUILD.gn16
-rw-r--r--mojo/apps/js/bindings/gl/BUILD.gn16
2 files changed, 19 insertions, 13 deletions
diff --git a/mojo/apps/js/BUILD.gn b/mojo/apps/js/BUILD.gn
index a3fbb8a..60ec320 100644
--- a/mojo/apps/js/BUILD.gn
+++ b/mojo/apps/js/BUILD.gn
@@ -12,9 +12,12 @@ shared_library("mojo_js") {
deps = [
":js",
+ "//base",
"//base:i18n",
+ "//gin",
"//mojo/application",
"//mojo/public/c/system:for_shared_library",
+ "//mojo/public/cpp/application",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/utility",
"//mojo/services/public/interfaces/content_handler",
@@ -23,16 +26,19 @@ shared_library("mojo_js") {
# GYP version: part of mojo/mojo_apps.gypi:mojo_js_lib
source_set("js") {
+ sources = [
+ "mojo_runner_delegate.cc",
+ "mojo_runner_delegate.h",
+ ]
+
+ public_deps = [
+ "//mojo/bindings/js",
+ ]
deps = [
"//base",
"//gin",
"//mojo/apps/js/bindings",
"//mojo/apps/js/bindings/gl",
- "//mojo/bindings/js",
"//v8",
]
- sources = [
- "mojo_runner_delegate.cc",
- "mojo_runner_delegate.h",
- ]
}
diff --git a/mojo/apps/js/bindings/gl/BUILD.gn b/mojo/apps/js/bindings/gl/BUILD.gn
index 02edaa3..0ee7e13 100644
--- a/mojo/apps/js/bindings/gl/BUILD.gn
+++ b/mojo/apps/js/bindings/gl/BUILD.gn
@@ -4,20 +4,20 @@
# GYP version: part of mojo/mojo_apps.gypi:mojo_js_lib
source_set("gl") {
+ sources = [
+ "context.cc",
+ "context.h",
+ "module.cc",
+ "module.h",
+ ]
+
deps = [
"//base",
"//gin",
"//v8",
+ "//mojo/bindings/js",
"//mojo/environment:chromium",
"//mojo/public/gles2:for_shared_library",
"//mojo/services/gles2:bindings",
]
-
-
- sources = [
- "context.cc",
- "context.h",
- "module.cc",
- "module.h",
- ]
}