Skip to content

Commit

Permalink
Gets remainder of mojo directory passing gn check
Browse files Browse the repository at this point in the history
BUG=none
TEST=none
R=jam@chromium.org

Review URL: https://codereview.chromium.org/1285603002

Cr-Commit-Position: refs/heads/master@{#342668}
  • Loading branch information
sky authored and Commit bot committed Aug 10, 2015
1 parent d241db3 commit 3439314
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 26 deletions.
24 changes: 1 addition & 23 deletions .gn
Original file line number Diff line number Diff line change
Expand Up @@ -75,29 +75,7 @@ check_targets = [

#"//jingle/*",
#"//media/*", # Lots of errors.
"mojo/android/*",
"mojo/application/*",
"mojo/build/*",
"mojo/cc/*",
"mojo/common/*",
"mojo/converters/*",
"mojo/environment/*",

# TODO(sky): resolve this.
# "mojo/gles2/*",
"mojo/gpu/*",
"mojo/message_pump/*",
"mojo/nacl/*",

# TODO(sky): resolve this.
# "mojo/platform_handle/*",
"mojo/public/*",
"mojo/runner/*",
"mojo/services/*",
"mojo/shell/*",
"mojo/test/*",
"mojo/tools/*",
"mojo/util/*",
"mojo/*",

#"//native_client/*",
#"//net/*", # Needs GN binary changes to work on Android.
Expand Down
1 change: 1 addition & 0 deletions mojo/gles2/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ source_set("gles2") {
"//gpu/command_buffer/service:service_sources",
"//gpu/command_buffer/common",
"//mojo/environment:chromium",
"//mojo/platform_handle:defs",
"//third_party/mojo/src/mojo/public/c/gles2:headers",
"//third_party/mojo/src/mojo/public/c/system",
"//third_party/mojo/src/mojo/public/cpp/bindings",
Expand Down
18 changes: 15 additions & 3 deletions mojo/platform_handle/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,33 @@ source_set("platform_handle") {
]

deps = [
":defs",
"//third_party/mojo/src/mojo/public/c/system",
]

public_deps = [
":defs",
]

defines = [ "PLATFORM_HANDLE_IMPLEMENTATION" ]
}

# Only targets that are registering the thunks should depend upon this.
# Only targets that are registering the thunks or get linked into the runner
# depend upon this target. The rest should use the |platform_handle| target
# above.
source_set("defs") {
visibility = [
":platform_handle",
"//mojo/gles2",
"//mojo/runner:native_application_support",
]

sources = [
"native_exports.h",
"platform_handle.h",
"platform_handle_exports.h",
"platform_handle_functions.h",
]

deps = [
"//third_party/mojo/src/mojo/public/c/system",
]
}

0 comments on commit 3439314

Please sign in to comment.