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

Side by Side Diff: mojo/mojo_edk.gyp

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 { 5 {
6 'includes': [ 6 'includes': [
7 '../third_party/mojo/mojo_variables.gypi', 7 'mojo_variables.gypi',
8 ], 8 ],
9 'target_defaults' : { 9 'target_defaults' : {
10 'include_dirs': [ 10 'include_dirs': [
11 '..', 11 '..',
12 '../third_party/mojo/src',
13 ], 12 ],
14 'direct_dependent_settings': { 13 'direct_dependent_settings': {
15 'include_dirs': [ 14 'include_dirs': [
16 '..', 15 '..',
17 ], 16 ],
18 }, 17 },
19 }, 18 },
20 'targets': [ 19 'targets': [
21 { 20 {
22 # GN version: //mojo/edk/system 21 # GN version: //mojo/edk/system
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 }, 205 },
207 { 206 {
208 # GN version: //mojo/edk/test:run_all_unittests 207 # GN version: //mojo/edk/test:run_all_unittests
209 # TODO(use_chrome_edk): remove "2" 208 # TODO(use_chrome_edk): remove "2"
210 'target_name': 'mojo_run_all_unittests2', 209 'target_name': 'mojo_run_all_unittests2',
211 'type': 'static_library', 210 'type': 'static_library',
212 'dependencies': [ 211 'dependencies': [
213 '../base/base.gyp:base', 212 '../base/base.gyp:base',
214 '../base/base.gyp:test_support_base', 213 '../base/base.gyp:test_support_base',
215 '../testing/gtest.gyp:gtest', 214 '../testing/gtest.gyp:gtest',
216 '../third_party/mojo/mojo_public.gyp:mojo_public_test_support', 215 '../mojo/mojo_public.gyp:mojo_public_test_support',
217 'mojo_system_impl2', 216 'mojo_system_impl2',
218 'mojo_test_support_impl2', 217 'mojo_test_support_impl2',
219 ], 218 ],
220 'sources': [ 219 'sources': [
221 'edk/test/run_all_unittests.cc', 220 'edk/test/run_all_unittests.cc',
222 ], 221 ],
223 }, 222 },
224 ], 223 ],
225 } 224 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698