Commit b8b4f2b2 authored by cmasone@chromium.org's avatar cmasone@chromium.org

Re-land "Add GN build targets for the rest of mojo/public"

Add GN build targets for the rest of mojo/public

BUG=369643
TEST='gn gen out/Debug && ninja -C out/Debug mojo

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283697 0039d316-1c4b-4281-b951-d872f2087c98
parent 7157776b
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
group("mojo") { group("mojo") {
deps = [ deps = [
"//mojo/public/cpp/bindings", "//mojo/public",
"//mojo/public/interfaces/bindings/tests:test_interfaces",
"//mojo/public/interfaces/service_provider:service_provider",
"//mojo/public/js/bindings",
] ]
} }
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
{ {
'targets': [ 'targets': [
{ {
# GN version: //mojo/public/c/system
'target_name': 'mojo_system', 'target_name': 'mojo_system',
'type': 'static_library', 'type': 'static_library',
'defines': [ 'defines': [
...@@ -112,6 +113,7 @@ ...@@ -112,6 +113,7 @@
], ],
}, },
{ {
# GN version: //mojo/public/cpp/environment:standalone
'target_name': 'mojo_environment_standalone', 'target_name': 'mojo_environment_standalone',
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
...@@ -131,6 +133,7 @@ ...@@ -131,6 +133,7 @@
], ],
}, },
{ {
# GN version: //mojo/public/cpp/utility
'target_name': 'mojo_utility', 'target_name': 'mojo_utility',
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
...@@ -176,6 +179,7 @@ ...@@ -176,6 +179,7 @@
], ],
}, },
{ {
# GN version: //mojo/public/cpp/application
'target_name': 'mojo_application', 'target_name': 'mojo_application',
'type': 'static_library', 'type': 'static_library',
'sources': [ 'sources': [
...@@ -201,6 +205,7 @@ ...@@ -201,6 +205,7 @@
['OS == "android"', { ['OS == "android"', {
'targets': [ 'targets': [
{ {
# GN version: //mojo/public/java
'target_name': 'mojo_public_java', 'target_name': 'mojo_public_java',
'type': 'none', 'type': 'none',
'variables': { 'variables': {
...@@ -209,6 +214,8 @@ ...@@ -209,6 +214,8 @@
'includes': [ '../build/java.gypi' ], 'includes': [ '../build/java.gypi' ],
}, },
{ {
# TODO(cmasone): Move out of mojo_public, as this is built from code
# outside mojo/public.
'target_name': 'mojo_bindings_java', 'target_name': 'mojo_bindings_java',
'type': 'none', 'type': 'none',
'variables': { 'variables': {
......
# 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.
group("public") {
deps = [
"//mojo/public/c/system",
"//mojo/public/cpp/application",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/environment:standalone",
"//mojo/public/cpp/utility",
"//mojo/public/interfaces/bindings/tests:test_interfaces",
"//mojo/public/interfaces/service_provider",
"//mojo/public/js/bindings",
]
if (is_android) {
deps += [
"//mojo/public/java",
]
}
}
# 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.
source_set("system") {
sources = [
"../../platform/native/system_thunks.cc",
"../../platform/native/system_thunks.h",
"buffer.h",
"core.h",
"data_pipe.h",
"functions.h",
"macros.h",
"message_pipe.h",
"system_export.h",
"types.h",
]
defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ]
# The GYP target analogous to this one builds this code into a
# static library. When building for Android, both the GYP and GN
# builds add --exclude-libs=ALL globally, which means that all
# symbols in static libraries are excluded from export. That's a
# problem, as code outside this target needs to be able to call
# MojoSetSystemThunks(). Therefore, the GYP target needs to specifiy
# that all dependent targets remove that link flag. Since GN uses a
# source_set here, this flag change is not needed.
}
# 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.
source_set("application") {
sources = [
"application_impl.h",
"connect.h",
"lib/application_impl.cc",
"lib/service_connector.cc",
"lib/service_connector.h",
"lib/application_connection.cc",
"lib/application_delegate.cc",
"lib/service_registry.cc",
"lib/service_registry.h",
]
deps = [
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/service_provider",
]
}
# 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.
source_set("standalone") {
sources = [
"../c/environment/async_waiter.h",
"../c/environment/logger.h",
"environment.h",
"lib/default_async_waiter.cc",
"lib/default_async_waiter.h",
"lib/default_logger.cc",
"lib/default_logger.h",
"lib/environment.cc",
"lib/logging.cc",
"logging.h",
]
}
# 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.
source_set("utility") {
sources = [
"mutex.h",
"run_loop.h",
"run_loop_handler.h",
"thread.h",
"lib/mutex.cc",
"lib/run_loop.cc",
"lib/thread.cc",
"lib/thread_local.h",
"lib/thread_local_posix.cc",
"lib/thread_local_win.cc",
]
if (is_win) {
# See crbug.com/342893:
sources -= [
"mutex.h",
"thread.h",
"lib/mutex.cc",
"lib/thread.cc",
]
}
}
# 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/android/rules.gni")
android_library("java") {
java_files = [
"src/org/chromium/mojo/system/AsyncWaiter.java",
"src/org/chromium/mojo/system/Core.java",
"src/org/chromium/mojo/system/DataPipe.java",
"src/org/chromium/mojo/system/Flags.java",
"src/org/chromium/mojo/system/Handle.java",
"src/org/chromium/mojo/system/InvalidHandle.java",
"src/org/chromium/mojo/system/MessagePipeHandle.java",
"src/org/chromium/mojo/system/MojoException.java",
"src/org/chromium/mojo/system/MojoResult.java",
"src/org/chromium/mojo/system/Pair.java",
"src/org/chromium/mojo/system/SharedBufferHandle.java",
"src/org/chromium/mojo/system/UntypedHandle.java",
]
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment