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

Side by Side Diff: base/base.gypi

Issue 10795083: Enable some parts of base that were previously disabled in base_untrusted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'base_target': 0, 8 'base_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 'base_paths.cc', 56 'base_paths.cc',
57 'base_paths.h', 57 'base_paths.h',
58 'base_paths_android.cc', 58 'base_paths_android.cc',
59 'base_paths_android.h', 59 'base_paths_android.h',
60 'base_paths_mac.h', 60 'base_paths_mac.h',
61 'base_paths_mac.mm', 61 'base_paths_mac.mm',
62 'base_paths_posix.cc', 62 'base_paths_posix.cc',
63 'base_paths_win.cc', 63 'base_paths_win.cc',
64 'base_paths_win.h', 64 'base_paths_win.h',
65 'base_switches.h', 65 'base_switches.h',
66 'base64.cc',
67 'base64.h',
66 'basictypes.h', 68 'basictypes.h',
67 'bind.h', 69 'bind.h',
68 'bind_helpers.cc', 70 'bind_helpers.cc',
69 'bind_helpers.h', 71 'bind_helpers.h',
70 'bind_internal.h', 72 'bind_internal.h',
71 'bind_internal_win.h', 73 'bind_internal_win.h',
72 'bits.h', 74 'bits.h',
73 'build_time.cc', 75 'build_time.cc',
74 'build_time.h', 76 'build_time.h',
75 'callback.h', 77 'callback.h',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 'profiler/scoped_profile.cc', 292 'profiler/scoped_profile.cc',
291 'profiler/scoped_profile.h', 293 'profiler/scoped_profile.h',
292 'profiler/alternate_timer.cc', 294 'profiler/alternate_timer.cc',
293 'profiler/alternate_timer.h', 295 'profiler/alternate_timer.h',
294 'profiler/tracked_time.cc', 296 'profiler/tracked_time.cc',
295 'profiler/tracked_time.h', 297 'profiler/tracked_time.h',
296 'property_bag.cc', 298 'property_bag.cc',
297 'property_bag.h', 299 'property_bag.h',
298 'rand_util.cc', 300 'rand_util.cc',
299 'rand_util.h', 301 'rand_util.h',
302 'rand_util_nacl.cc',
300 'rand_util_posix.cc', 303 'rand_util_posix.cc',
301 'rand_util_win.cc', 304 'rand_util_win.cc',
302 'run_loop.cc', 305 'run_loop.cc',
303 'run_loop.h', 306 'run_loop.h',
304 'safe_strerror_posix.cc', 307 'safe_strerror_posix.cc',
305 'safe_strerror_posix.h', 308 'safe_strerror_posix.h',
306 'scoped_native_library.cc', 309 'scoped_native_library.cc',
307 'scoped_native_library.h', 310 'scoped_native_library.h',
308 'scoped_temp_dir.cc', 311 'scoped_temp_dir.cc',
309 'scoped_temp_dir.h', 312 'scoped_temp_dir.h',
(...skipping 15 matching lines...) Expand all
325 'string_number_conversions.h', 328 'string_number_conversions.h',
326 'string_piece.cc', 329 'string_piece.cc',
327 'string_piece.h', 330 'string_piece.h',
328 'string_split.cc', 331 'string_split.cc',
329 'string_split.h', 332 'string_split.h',
330 'string_tokenizer.h', 333 'string_tokenizer.h',
331 'string_util.cc', 334 'string_util.cc',
332 'string_util.h', 335 'string_util.h',
333 'string_util_posix.h', 336 'string_util_posix.h',
334 'string_util_win.h', 337 'string_util_win.h',
338 'string16.cc',
339 'string16.h',
335 'stringize_macros.h', 340 'stringize_macros.h',
336 'stringprintf.cc', 341 'stringprintf.cc',
337 'stringprintf.h', 342 'stringprintf.h',
338 'supports_user_data.cc', 343 'supports_user_data.cc',
339 'supports_user_data.h', 344 'supports_user_data.h',
340 'synchronization/cancellation_flag.cc', 345 'synchronization/cancellation_flag.cc',
341 'synchronization/cancellation_flag.h', 346 'synchronization/cancellation_flag.h',
342 'synchronization/condition_variable.h', 347 'synchronization/condition_variable.h',
343 'synchronization/condition_variable_posix.cc', 348 'synchronization/condition_variable_posix.cc',
344 'synchronization/condition_variable_win.cc', 349 'synchronization/condition_variable_win.cc',
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 'threading/thread_restrictions.cc', 417 'threading/thread_restrictions.cc',
413 'threading/watchdog.cc', 418 'threading/watchdog.cc',
414 'threading/watchdog.h', 419 'threading/watchdog.h',
415 'threading/worker_pool.h', 420 'threading/worker_pool.h',
416 'threading/worker_pool.cc', 421 'threading/worker_pool.cc',
417 'threading/worker_pool_posix.cc', 422 'threading/worker_pool_posix.cc',
418 'threading/worker_pool_posix.h', 423 'threading/worker_pool_posix.h',
419 'threading/worker_pool_win.cc', 424 'threading/worker_pool_win.cc',
420 'time.cc', 425 'time.cc',
421 'time.h', 426 'time.h',
427 'time_posix.cc',
422 'time_win.cc', 428 'time_win.cc',
423 'timer.cc', 429 'timer.cc',
424 'timer.h', 430 'timer.h',
425 'tracked_objects.cc', 431 'tracked_objects.cc',
426 'tracked_objects.h', 432 'tracked_objects.h',
427 'tracking_info.cc', 433 'tracking_info.cc',
428 'tracking_info.h', 434 'tracking_info.h',
429 'tuple.h', 435 'tuple.h',
430 'utf_offset_string_conversions.cc', 436 'utf_offset_string_conversions.cc',
431 'utf_offset_string_conversions.h', 437 'utf_offset_string_conversions.h',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 'linux_util.cc', 528 'linux_util.cc',
523 ], 529 ],
524 }, 530 },
525 ], 531 ],
526 ['>(nacl_untrusted_build)==1', { 532 ['>(nacl_untrusted_build)==1', {
527 'sources!': [ 533 'sources!': [
528 'base_paths.cc', 534 'base_paths.cc',
529 'command_line.cc', 535 'command_line.cc',
530 'cpu.cc', 536 'cpu.cc',
531 'debug/stack_trace_posix.cc', 537 'debug/stack_trace_posix.cc',
532 'environment.cc',
533 'file_util.cc', 538 'file_util.cc',
534 'file_util_posix.cc', 539 'file_util_posix.cc',
535 'file_util_proxy.cc', 540 'file_util_proxy.cc',
536 'files/file_path_watcher_kqueue.cc', 541 'files/file_path_watcher_kqueue.cc',
537 'native_library_posix.cc', 542 'native_library_posix.cc',
538 'path_service.cc', 543 'path_service.cc',
539 'platform_file_posix.cc', 544 'platform_file_posix.cc',
540 'posix/unix_domain_socket.cc', 545 'posix/unix_domain_socket.cc',
541 'process_posix.cc', 546 'process_posix.cc',
542 'process_util.cc', 547 'process_util.cc',
543 'process_util_posix.cc', 548 'process_util_posix.cc',
544 'rand_util.cc',
545 'rand_util_posix.cc', 549 'rand_util_posix.cc',
546 'scoped_native_library.cc', 550 'scoped_native_library.cc',
547 'scoped_temp_dir.cc', 551 'scoped_temp_dir.cc',
548 'shared_memory_posix.cc', 552 'shared_memory_posix.cc',
549 'sys_info_posix.cc', 553 'sys_info_posix.cc',
550 'threading/sequenced_worker_pool.cc', 554 'threading/sequenced_worker_pool.cc',
551 'third_party/dynamic_annotations/dynamic_annotations.c', 555 'third_party/dynamic_annotations/dynamic_annotations.c',
552 ], 556 ],
553 }], 557 }],
554 ['OS == "android" and >(nacl_untrusted_build)==0', { 558 ['OS == "android" and >(nacl_untrusted_build)==0', {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 ['exclude', '^process_linux\\.cc$'], 652 ['exclude', '^process_linux\\.cc$'],
649 ['exclude', '^process_util_linux\\.cc$'], 653 ['exclude', '^process_util_linux\\.cc$'],
650 ['exclude', '^sys_info_linux\\.cc$'], 654 ['exclude', '^sys_info_linux\\.cc$'],
651 ], 655 ],
652 }], 656 }],
653 ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', { 657 ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
654 'sources/': [ 658 'sources/': [
655 ['exclude', '^chromeos/'], 659 ['exclude', '^chromeos/'],
656 ], 660 ],
657 }], 661 }],
662 ['>(nacl_untrusted_build)==1', {
663 'sources/': [
664 ['include', 'synchronization/.*_posix\\.cc$'],
665 ['include', 'threading/.*_posix\\.cc$'],
666 ['include', 'time_posix\\.cc$'],
667 ['include', 'safe_strerror_posix\\.cc$'],
668 ['include', 'atomicops_internals_x86_gcc\\.cc$'],
669 ['include', 'debugger_posix\\.cc$'],
670 ],
671 }],
658 ], 672 ],
659 }], 673 }],
660 ], 674 ],
661 }, 675 },
662 } 676 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | base/base_untrusted.gyp » ('j') | base/rand_util_nacl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698