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

Side by Side Diff: third_party/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 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 { 5 {
6 'includes': [ 6 'includes': [
7 'mojo_variables.gypi', 7 '../../mojo/mojo_variables.gypi',
8 ], 8 ],
9 'target_defaults' : { 9 'target_defaults' : {
10 'include_dirs': [ 10 'include_dirs': [
11 # TODO(use_chrome_edk): since we include a few headers from src/mojo/edk, 11 # TODO(use_chrome_edk): since we include a few headers from src/mojo/edk,
12 # we need their includes to be searched first (i.e. otherwise when 12 # we need their includes to be searched first (i.e. otherwise when
13 # embedder.cc in third_party includes core.h from src/mojo/edk, and the 13 # embedder.cc in third_party includes core.h from src/mojo/edk, and the
14 # latter includes mojo/edk/system/memory.h, the header from third_party 14 # latter includes mojo/edk/system/memory.h, the header from third_party
15 # would incorrectly get chosen). 15 # would incorrectly get chosen).
16 '../..', 16 '../..',
17 'src', 17 'src',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 }], 110 }],
111 ], 111 ],
112 }, 112 },
113 { 113 {
114 # GN version: //mojo/edk/test:run_all_unittests 114 # GN version: //mojo/edk/test:run_all_unittests
115 'target_name': 'mojo_run_all_unittests', 115 'target_name': 'mojo_run_all_unittests',
116 'type': 'static_library', 116 'type': 'static_library',
117 'dependencies': [ 117 'dependencies': [
118 '../../base/base.gyp:base', 118 '../../base/base.gyp:base',
119 '../../base/base.gyp:test_support_base', 119 '../../base/base.gyp:test_support_base',
120 '../../mojo/mojo_public.gyp:mojo_public_test_support',
120 '../../testing/gtest.gyp:gtest', 121 '../../testing/gtest.gyp:gtest',
121 'mojo_system_impl', 122 'mojo_system_impl',
122 'mojo_public.gyp:mojo_public_test_support',
123 'mojo_test_support_impl', 123 'mojo_test_support_impl',
124 ], 124 ],
125 'sources': [ 125 'sources': [
126 'src/mojo/edk/test/run_all_unittests.cc', 126 'src/mojo/edk/test/run_all_unittests.cc',
127 ], 127 ],
128 }, 128 },
129 { 129 {
130 # GN version: //mojo/edk/test:run_all_perftests 130 # GN version: //mojo/edk/test:run_all_perftests
131 'target_name': 'mojo_run_all_perftests', 131 'target_name': 'mojo_run_all_perftests',
132 'type': 'static_library', 132 'type': 'static_library',
133 'dependencies': [ 133 'dependencies': [
134 '../../base/base.gyp:test_support_base', 134 '../../base/base.gyp:test_support_base',
135 '../../mojo/mojo_public.gyp:mojo_public_test_support',
135 'mojo_edk.gyp:mojo_system_impl', 136 'mojo_edk.gyp:mojo_system_impl',
136 'mojo_public.gyp:mojo_public_test_support',
137 'mojo_test_support_impl', 137 'mojo_test_support_impl',
138 ], 138 ],
139 'sources': [ 139 'sources': [
140 'src/mojo/edk/test/run_all_perftests.cc', 140 'src/mojo/edk/test/run_all_perftests.cc',
141 ], 141 ],
142 }, 142 },
143 ], 143 ],
144 'conditions': [ 144 'conditions': [
145 ['OS=="win" and target_arch=="ia32"', { 145 ['OS=="win" and target_arch=="ia32"', {
146 'targets': [ 146 'targets': [
(...skipping 10 matching lines...) Expand all
157 'configurations': { 157 'configurations': {
158 'Common_Base': { 158 'Common_Base': {
159 'msvs_target_platform': 'x64', 159 'msvs_target_platform': 'x64',
160 }, 160 },
161 }, 161 },
162 }, 162 },
163 ], 163 ],
164 }], 164 }],
165 ], 165 ],
166 } 166 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698