| OLD | NEW |
| 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 ], | 12 ], |
| 13 'direct_dependent_settings': { | 13 'direct_dependent_settings': { |
| 14 'include_dirs': [ | 14 'include_dirs': [ |
| 15 '..', | 15 '..', |
| 16 ], | 16 ], |
| 17 }, | 17 }, |
| 18 }, | 18 }, |
| 19 'targets': [ | 19 'targets': [ |
| 20 { | 20 { |
| 21 # GN version: //mojo/edk/system | 21 # GN version: //mojo/edk/system |
| 22 'target_name': 'mojo_system_impl2', | 22 'target_name': 'mojo_system_impl', |
| 23 'type': 'static_library', | 23 'type': '<(component)', |
| 24 # TODO(use_chrome_edk): this should be a component to match third_party, | |
| 25 # but since third_party includes it, we either make it a static library | |
| 26 # or we have to change the export macros to be different than third_party. | |
| 27 #'type': '<(component)', | |
| 28 'dependencies': [ | 24 'dependencies': [ |
| 29 '../base/base.gyp:base', | 25 '../base/base.gyp:base', |
| 30 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 26 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| 31 '../crypto/crypto.gyp:crypto', | 27 '../crypto/crypto.gyp:crypto', |
| 32 '../third_party/mojo/mojo_public.gyp:mojo_system_headers', | 28 'mojo_public.gyp:mojo_system_headers', |
| 33 ], | 29 ], |
| 34 'defines': [ | 30 'defines': [ |
| 35 'MOJO_SYSTEM_IMPL_IMPLEMENTATION', | 31 'MOJO_SYSTEM_IMPL_IMPLEMENTATION', |
| 36 'MOJO_SYSTEM_IMPLEMENTATION', | 32 'MOJO_SYSTEM_IMPLEMENTATION', |
| 37 'MOJO_USE_SYSTEM_IMPL', | 33 'MOJO_USE_SYSTEM_IMPL', |
| 38 ], | 34 ], |
| 39 'sources': [ | 35 'sources': [ |
| 40 'edk/embedder/configuration.h', | 36 'edk/embedder/configuration.h', |
| 41 'edk/embedder/embedder.cc', | 37 'edk/embedder/embedder.cc', |
| 42 'edk/embedder/embedder.h', | 38 'edk/embedder/embedder.h', |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 }], | 141 }], |
| 146 ['OS=="win"', { | 142 ['OS=="win"', { |
| 147 # Structure was padded due to __declspec(align()), which is | 143 # Structure was padded due to __declspec(align()), which is |
| 148 # uninteresting. | 144 # uninteresting. |
| 149 'msvs_disabled_warnings': [ 4324 ], | 145 'msvs_disabled_warnings': [ 4324 ], |
| 150 }], | 146 }], |
| 151 ], | 147 ], |
| 152 }, | 148 }, |
| 153 { | 149 { |
| 154 # GN version: //mojo/edk/js | 150 # GN version: //mojo/edk/js |
| 155 # TODO(use_chrome_edk): remove "2" | 151 'target_name': 'mojo_js_lib', |
| 156 'target_name': 'mojo_js_lib2', | |
| 157 'type': 'static_library', | 152 'type': 'static_library', |
| 158 'dependencies': [ | 153 'dependencies': [ |
| 159 '../base/base.gyp:base', | 154 '../base/base.gyp:base', |
| 160 '../gin/gin.gyp:gin', | 155 '../gin/gin.gyp:gin', |
| 161 '../v8/tools/gyp/v8.gyp:v8', | 156 '../v8/tools/gyp/v8.gyp:v8', |
| 162 ], | 157 ], |
| 163 'export_dependent_settings': [ | 158 'export_dependent_settings': [ |
| 164 '../base/base.gyp:base', | 159 '../base/base.gyp:base', |
| 165 '../gin/gin.gyp:gin', | 160 '../gin/gin.gyp:gin', |
| 166 ], | 161 ], |
| (...skipping 11 matching lines...) Expand all Loading... |
| 178 'edk/js/support.cc', | 173 'edk/js/support.cc', |
| 179 'edk/js/support.h', | 174 'edk/js/support.h', |
| 180 'edk/js/threading.cc', | 175 'edk/js/threading.cc', |
| 181 'edk/js/threading.h', | 176 'edk/js/threading.h', |
| 182 'edk/js/waiting_callback.cc', | 177 'edk/js/waiting_callback.cc', |
| 183 'edk/js/waiting_callback.h', | 178 'edk/js/waiting_callback.h', |
| 184 ], | 179 ], |
| 185 }, | 180 }, |
| 186 { | 181 { |
| 187 # GN version: //mojo/edk/test:test_support_impl | 182 # GN version: //mojo/edk/test:test_support_impl |
| 188 # TODO(use_chrome_edk): remove "2" | 183 'target_name': 'mojo_test_support_impl', |
| 189 'target_name': 'mojo_test_support_impl2', | |
| 190 'type': 'static_library', | 184 'type': 'static_library', |
| 191 'dependencies': [ | 185 'dependencies': [ |
| 192 '../base/base.gyp:base', | 186 '../base/base.gyp:base', |
| 193 ], | 187 ], |
| 194 'sources': [ | 188 'sources': [ |
| 195 'edk/test/test_support_impl.cc', | 189 'edk/test/test_support_impl.cc', |
| 196 'edk/test/test_support_impl.h', | 190 'edk/test/test_support_impl.h', |
| 197 ], | 191 ], |
| 198 }, | 192 }, |
| 199 { | 193 { |
| 200 # GN version: //mojo/edk/test:test_support | 194 # GN version: //mojo/edk/test:test_support |
| 201 'target_name': 'mojo_common_test_support2', | 195 'target_name': 'mojo_common_test_support', |
| 202 'type': 'static_library', | 196 'type': 'static_library', |
| 203 'dependencies': [ | 197 'dependencies': [ |
| 204 '../base/base.gyp:base', | 198 '../base/base.gyp:base', |
| 205 '../base/base.gyp:test_support_base', | 199 '../base/base.gyp:test_support_base', |
| 206 '../testing/gtest.gyp:gtest', | 200 '../testing/gtest.gyp:gtest', |
| 207 'mojo_system_impl2', | 201 'mojo_system_impl', |
| 208 ], | 202 ], |
| 209 'sources': [ | 203 'sources': [ |
| 210 'edk/test/mojo_test_base.cc', | 204 'edk/test/mojo_test_base.cc', |
| 211 'edk/test/mojo_test_base.h', | 205 'edk/test/mojo_test_base.h', |
| 212 'edk/test/multiprocess_test_helper.cc', | 206 'edk/test/multiprocess_test_helper.cc', |
| 213 'edk/test/multiprocess_test_helper.h', | 207 'edk/test/multiprocess_test_helper.h', |
| 214 'edk/test/scoped_ipc_support.cc', | 208 'edk/test/scoped_ipc_support.cc', |
| 215 'edk/test/scoped_ipc_support.h', | 209 'edk/test/scoped_ipc_support.h', |
| 216 'edk/test/test_utils.h', | 210 'edk/test/test_utils.h', |
| 217 'edk/test/test_utils_posix.cc', | 211 'edk/test/test_utils_posix.cc', |
| 218 'edk/test/test_utils_win.cc', | 212 'edk/test/test_utils_win.cc', |
| 219 ], | 213 ], |
| 220 'conditions': [ | 214 'conditions': [ |
| 221 ['OS=="ios"', { | 215 ['OS=="ios"', { |
| 222 'sources!': [ | 216 'sources!': [ |
| 223 'edk/test/multiprocess_test_helper.cc', | 217 'edk/test/multiprocess_test_helper.cc', |
| 224 ], | 218 ], |
| 225 }], | 219 }], |
| 226 ], | 220 ], |
| 227 }, | 221 }, |
| 228 { | 222 { |
| 229 # GN version: //mojo/edk/test:run_all_unittests | 223 # GN version: //mojo/edk/test:run_all_unittests |
| 230 # TODO(use_chrome_edk): remove "2" | 224 'target_name': 'mojo_run_all_unittests', |
| 231 'target_name': 'mojo_run_all_unittests2', | |
| 232 'type': 'static_library', | 225 'type': 'static_library', |
| 233 'dependencies': [ | 226 'dependencies': [ |
| 234 '../base/base.gyp:base', | 227 '../base/base.gyp:base', |
| 235 '../base/base.gyp:test_support_base', | 228 '../base/base.gyp:test_support_base', |
| 236 '../testing/gtest.gyp:gtest', | 229 '../testing/gtest.gyp:gtest', |
| 237 '../third_party/mojo/mojo_public.gyp:mojo_public_test_support', | 230 'mojo_common_test_support', |
| 238 'mojo_system_impl2', | 231 'mojo_public.gyp:mojo_public_test_support', |
| 239 'mojo_test_support_impl2', | 232 'mojo_system_impl', |
| 233 'mojo_test_support_impl', |
| 240 ], | 234 ], |
| 241 'sources': [ | 235 'sources': [ |
| 242 'edk/test/run_all_unittests.cc', | 236 'edk/test/run_all_unittests.cc', |
| 243 ], | 237 ], |
| 244 }, | 238 }, |
| 239 { |
| 240 # GN version: //mojo/edk/test:run_all_perftests |
| 241 'target_name': 'mojo_run_all_perftests', |
| 242 'type': 'static_library', |
| 243 'dependencies': [ |
| 244 '../base/base.gyp:base', |
| 245 '../base/base.gyp:test_support_base', |
| 246 '../testing/gtest.gyp:gtest', |
| 247 'mojo_common_test_support', |
| 248 'mojo_public.gyp:mojo_public_test_support', |
| 249 'mojo_system_impl', |
| 250 'mojo_test_support_impl', |
| 251 ], |
| 252 'sources': [ |
| 253 'edk/test/run_all_perftests.cc', |
| 254 ], |
| 255 }, |
| 245 ], | 256 ], |
| 246 } | 257 } |
| OLD | NEW |