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

Side by Side Diff: mojo/mojo_public.gyp

Issue 1960703004: Revert of mojo: make libmojo_public_test_support a static library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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_js_unittests.isolate ('k') | mojo/mojo_public_bindings_unittests.isolate » ('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 { 5 {
6 'includes': [ 6 'includes': [
7 'mojo_variables.gypi', 7 'mojo_variables.gypi',
8 ], 8 ],
9 'target_defaults' : { 9 'target_defaults' : {
10 'include_dirs': [ 10 'include_dirs': [
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 # target's configuration. 324 # target's configuration.
325 'target_name': 'mojo_interface_bindings_generation', 325 'target_name': 'mojo_interface_bindings_generation',
326 'type': 'none', 326 'type': 'none',
327 'dependencies': [ 327 'dependencies': [
328 'mojo_interface_bindings_cpp_sources', 328 'mojo_interface_bindings_cpp_sources',
329 ], 329 ],
330 }, 330 },
331 { 331 {
332 # GN version: //mojo/public/c/test_support 332 # GN version: //mojo/public/c/test_support
333 'target_name': 'mojo_public_test_support', 333 'target_name': 'mojo_public_test_support',
334 'type': 'static_library', 334 'defines': [
335 'MOJO_TEST_SUPPORT_IMPLEMENTATION',
336 ],
335 'include_dirs': [ 337 'include_dirs': [
336 '..', 338 '..',
337 ], 339 ],
338 'direct_dependent_settings': { 340 'direct_dependent_settings': {
339 'include_dirs': [ 341 'include_dirs': [
340 '..', 342 '..',
341 ], 343 ],
342 }, 344 },
343 'sources': [ 345 'sources': [
344 'public/c/test_support/test_support.h', 346 'public/c/test_support/test_support.h',
347 'public/c/test_support/test_support_export.h',
345 # TODO(vtl): Convert this to thunks http://crbug.com/386799 348 # TODO(vtl): Convert this to thunks http://crbug.com/386799
346 'public/tests/test_support_private.cc', 349 'public/tests/test_support_private.cc',
347 'public/tests/test_support_private.h', 350 'public/tests/test_support_private.h',
348 ], 351 ],
352 'conditions': [
353 ['OS=="ios"', {
354 'type': 'static_library',
355 }, {
356 'type': 'shared_library',
357 }],
358 ['OS=="mac"', {
359 'xcode_settings': {
360 # Make it a run-path dependent library.
361 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
362 },
363 }],
364 ],
349 }, 365 },
350 { 366 {
351 # GN version: //mojo/public/cpp/test_support:test_utils 367 # GN version: //mojo/public/cpp/test_support:test_utils
352 'target_name': 'mojo_public_test_utils', 368 'target_name': 'mojo_public_test_utils',
353 'type': 'static_library', 369 'type': 'static_library',
354 'dependencies': [ 370 'dependencies': [
355 '../base/base.gyp:base', 371 '../base/base.gyp:base',
356 '../testing/gtest.gyp:gtest', 372 '../testing/gtest.gyp:gtest',
357 'mojo_public_test_support', 373 'mojo_public_test_support',
358 ], 374 ],
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 'mojo_interface_bindings_java_sources', 543 'mojo_interface_bindings_java_sources',
528 'mojo_public_java', 544 'mojo_public_java',
529 '<(DEPTH)/base/base.gyp:base_java', 545 '<(DEPTH)/base/base.gyp:base_java',
530 ], 546 ],
531 'includes': [ '../build/java.gypi' ], 547 'includes': [ '../build/java.gypi' ],
532 }, 548 },
533 ], 549 ],
534 }], 550 }],
535 ], 551 ],
536 } 552 }
OLDNEW
« no previous file with comments | « mojo/mojo_js_unittests.isolate ('k') | mojo/mojo_public_bindings_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698