Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Side by Side Diff: mojo/mojo_base.gyp

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/mojo.gyp ('k') | mojo/public/VERSION » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Essential components (and their tests) that are needed to build 5 # Essential components (and their tests) that are needed to build
6 # Chrome should be here. Other components that are useful only in 6 # Chrome should be here. Other components that are useful only in
7 # Mojo land like mojo_shell should be in mojo.gyp. 7 # Mojo land like mojo_shell should be in mojo.gyp.
8 { 8 {
9 'includes': [ 9 'includes': [
10 'mojo_variables.gypi', 10 'mojo_variables.gypi',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 'common/time_helper.cc', 64 'common/time_helper.cc',
65 'common/time_helper.h', 65 'common/time_helper.h',
66 ], 66 ],
67 }, 67 },
68 { 68 {
69 # GN version: //mojo/common:mojo_common_unittests 69 # GN version: //mojo/common:mojo_common_unittests
70 'target_name': 'mojo_common_unittests', 70 'target_name': 'mojo_common_unittests',
71 'type': 'executable', 71 'type': 'executable',
72 'dependencies': [ 72 'dependencies': [
73 '../base/base.gyp:base', 73 '../base/base.gyp:base',
74 '../base/base.gyp:test_support_base',
74 '../base/base.gyp:base_message_loop_tests', 75 '../base/base.gyp:base_message_loop_tests',
75 '../testing/gtest.gyp:gtest', 76 '../testing/gtest.gyp:gtest',
76 '../url/url.gyp:url_lib', 77 '../url/url.gyp:url_lib',
78 'edk/mojo_edk.gyp:mojo_system_impl',
77 'edk/mojo_edk.gyp:mojo_common_test_support', 79 'edk/mojo_edk.gyp:mojo_common_test_support',
78 'edk/mojo_edk.gyp:mojo_run_all_unittests', 80 'edk/mojo_edk.gyp:mojo_run_all_unittests',
79 'mojo_common_lib', 81 'mojo_common_lib',
80 'mojo_environment_chromium', 82 'mojo_environment_chromium',
81 'public/mojo_public.gyp:mojo_cpp_bindings', 83 'public/mojo_public.gyp:mojo_cpp_bindings',
82 'public/mojo_public.gyp:mojo_public_test_utils', 84 'public/mojo_public.gyp:mojo_public_test_utils',
83 ], 85 ],
84 'sources': [ 86 'sources': [
85 'common/common_type_converters_unittest.cc', 87 'common/common_type_converters_unittest.cc',
86 'common/handle_watcher_unittest.cc', 88 'common/handle_watcher_unittest.cc',
87 'common/message_pump_mojo_unittest.cc', 89 'common/message_pump_mojo_unittest.cc',
88 'edk/test/multiprocess_test_helper_unittest.cc',
89 ],
90 'conditions': [
91 ['OS=="ios"', {
92 'sources!': [
93 'edk/test/multiprocess_test_helper_unittest.cc',
94 ],
95 }],
96 ], 90 ],
97 }, 91 },
98 { 92 {
99 # GN version: //mojo/environment:chromium 93 # GN version: //mojo/environment:chromium
100 'target_name': 'mojo_environment_chromium', 94 'target_name': 'mojo_environment_chromium',
101 'type': 'static_library', 95 'type': 'static_library',
102 'dependencies': [ 96 'dependencies': [
103 'mojo_environment_chromium_impl', 97 'mojo_environment_chromium_impl',
104 ], 98 ],
105 'sources': [ 99 'sources': [
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 ], 206 ],
213 'variables': { 207 'variables': {
214 'java_in_dir': '<(DEPTH)/mojo/android/system', 208 'java_in_dir': '<(DEPTH)/mojo/android/system',
215 }, 209 },
216 'includes': [ '../build/java.gypi' ], 210 'includes': [ '../build/java.gypi' ],
217 }, 211 },
218 ] 212 ]
219 }] 213 }]
220 ] 214 ]
221 } 215 }
OLDNEW
« no previous file with comments | « mojo/mojo.gyp ('k') | mojo/public/VERSION » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698