summaryrefslogtreecommitdiff
path: root/chromium/mojo
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-11 21:33:03 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-12-13 12:34:07 +0100
commitf2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch)
tree0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/mojo
parent5362912cdb5eea702b68ebe23702468d17c3017a (diff)
downloadqtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/mojo')
-rw-r--r--chromium/mojo/mojo.gyp49
1 files changed, 49 insertions, 0 deletions
diff --git a/chromium/mojo/mojo.gyp b/chromium/mojo/mojo.gyp
new file mode 100644
index 00000000000..e323d288109
--- /dev/null
+++ b/chromium/mojo/mojo.gyp
@@ -0,0 +1,49 @@
+# Copyright 2013 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.
+
+{
+ 'variables': {
+ 'chromium_code': 1, # Use higher warning level.
+ },
+ 'target_defaults': {
+ 'defines': ['MOJO_IMPLEMENTATION'],
+ },
+ 'targets': [
+ {
+ 'target_name': 'mojo',
+ 'type': 'none',
+ 'dependencies': [
+ 'mojo_message',
+ ],
+ },
+ {
+ 'target_name': 'mojo_message',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '..',
+ ],
+ 'sources': [
+ 'public/libs/message/message.cc',
+ 'public/libs/message/message.h',
+ 'public/libs/message/message_builder.cc',
+ 'public/libs/message/message_builder.h',
+ ],
+ },
+ {
+ 'target_name': 'mojo_unittests',
+ 'type': 'executable',
+ 'dependencies': [
+ 'mojo_message',
+ '../base/base.gyp:run_all_unittests',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+ '..'
+ ],
+ 'sources': [
+ 'public/libs/message/message_unittest.cc',
+ ],
+ },
+ ],
+}