Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 'dependencies': [ | 6 'dependencies': [ |
| 7 '../base/base.gyp:base', | 7 '../base/base.gyp:base', |
| 8 '../build/temp_gyp/googleurl.gyp:googleurl', | 8 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 9 '../gpu/gpu.gyp:gles2_implementation', | |
| 10 '../gpu/gpu.gyp:gpu_ipc', | |
| 11 '../ipc/ipc.gyp:ipc', | |
| 12 '../media/media.gyp:media', | 9 '../media/media.gyp:media', |
| 13 '../media/media.gyp:shared_memory_support', | |
| 14 '../net/net.gyp:net', | 10 '../net/net.gyp:net', |
| 15 '../ppapi/ppapi_internal.gyp:ppapi_shared', | |
| 16 '../skia/skia.gyp:skia', | 11 '../skia/skia.gyp:skia', |
| 17 '../third_party/icu/icu.gyp:icuuc', | 12 '../third_party/icu/icu.gyp:icuuc', |
| 18 '../third_party/npapi/npapi.gyp:npapi', | |
| 19 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', | |
| 20 '../ui/gl/gl.gyp:gl', | |
| 21 '../ui/ui.gyp:ui', | 13 '../ui/ui.gyp:ui', |
| 22 '../webkit/support/webkit_support.gyp:appcache', | |
| 23 '../webkit/support/webkit_support.gyp:blob', | |
| 24 '../webkit/support/webkit_support.gyp:database', | |
| 25 '../webkit/support/webkit_support.gyp:fileapi', | |
| 26 '../webkit/support/webkit_support.gyp:webkit_base', | |
| 27 ], | 14 ], |
| 28 'include_dirs': [ | 15 'include_dirs': [ |
| 29 '..', | 16 '..', |
| 30 ], | 17 ], |
| 31 'export_dependent_settings': [ | 18 'export_dependent_settings': [ |
| 32 '../base/base.gyp:base', | 19 '../base/base.gyp:base', |
| 33 ], | 20 ], |
| 34 'sources': [ | 21 'sources': [ |
| 35 'public/common/bindings_policy.h', | 22 'public/common/bindings_policy.h', |
| 36 'public/common/child_process_host.h', | 23 'public/common/child_process_host.h', |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 377 'public/common/common_param_traits.h', | 364 'public/common/common_param_traits.h', |
| 378 'public/common/common_param_traits_macros.h', | 365 'public/common/common_param_traits_macros.h', |
| 379 'public/common/content_client.cc', | 366 'public/common/content_client.cc', |
| 380 'public/common/content_client.h', | 367 'public/common/content_client.h', |
| 381 'public/common/window_container_type.cc', | 368 'public/common/window_container_type.cc', |
| 382 'public/common/window_container_type.h', | 369 'public/common/window_container_type.h', |
| 383 'public/common/webkit_param_traits.cc', | 370 'public/common/webkit_param_traits.cc', |
| 384 'public/common/webkit_param_traits.h', | 371 'public/common/webkit_param_traits.h', |
| 385 ], | 372 ], |
| 386 'conditions': [ | 373 'conditions': [ |
| 374 ['OS!="ios"', { | |
| 375 'dependencies': [ | |
| 376 '../gpu/gpu.gyp:gles2_implementation', | |
| 377 '../gpu/gpu.gyp:gpu_ipc', | |
| 378 '../ipc/ipc.gyp:ipc', | |
| 379 '../media/media.gyp:shared_memory_support', | |
| 380 '../ppapi/ppapi_internal.gyp:ppapi_shared', | |
| 381 '../third_party/npapi/npapi.gyp:npapi', | |
| 382 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', | |
| 383 '../ui/gl/gl.gyp:gl', | |
| 384 '../webkit/support/webkit_support.gyp:appcache', | |
| 385 '../webkit/support/webkit_support.gyp:blob', | |
| 386 '../webkit/support/webkit_support.gyp:database', | |
| 387 '../webkit/support/webkit_support.gyp:fileapi', | |
| 388 '../webkit/support/webkit_support.gyp:webkit_base', | |
| 389 ], | |
| 390 }], | |
| 387 ['OS!="win"', { | 391 ['OS!="win"', { |
| 388 'sources!': [ | 392 'sources!': [ |
| 389 'common/sandbox_policy.cc', | 393 'common/sandbox_policy.cc', |
| 390 'common/sandbox_policy.h', | 394 'common/sandbox_policy.h', |
| 391 ], | 395 ], |
| 392 }], | 396 }], |
| 393 ['OS=="android"',{ | 397 ['OS=="android"',{ |
| 394 'link_settings': { | 398 'link_settings': { |
| 395 'libraries': [ | 399 'libraries': [ |
| 396 '-landroid', # ANativeWindow | 400 '-landroid', # ANativeWindow |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 517 ], | 521 ], |
| 518 'action': [ | 522 'action': [ |
| 519 'python', | 523 'python', |
| 520 '../build/extract_from_cab.py', | 524 '../build/extract_from_cab.py', |
| 521 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', | 525 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', |
| 522 '<(output)', | 526 '<(output)', |
| 523 '<(PRODUCT_DIR)', | 527 '<(PRODUCT_DIR)', |
| 524 ], | 528 ], |
| 525 }, | 529 }, |
| 526 ] | 530 ] |
| 527 }] | 531 }], |
| 532 ['OS=="ios"', { | |
|
jam
2012/09/07 16:25:52
move this to 374 and combine
stuartmorgan
2012/09/07 17:03:41
FWIW, I separated them on purpose. Almost everywhe
jam
2012/09/10 05:46:07
+mmentovai: do we have a convention for this sort
Mark Mentovai
2012/09/10 12:54:41
John Abd-El-Malek wrote:
| |
| 533 'sources/': [ | |
| 534 # iOS only needs a small portion of content; exclude all the | |
| 535 # implementation, and re-include what is used. | |
| 536 ['exclude', '\\.(cc|mm)$'], | |
| 537 ['include', '_ios\\.(cc|mm)$'], | |
| 538 ['include', '^public/common/content_constants\\.cc$'], | |
| 539 ['include', '^public/common/content_switches\\.cc$'], | |
| 540 ['include', '^public/common/frame_navigate_params\\.cc$'], | |
| 541 ['include', '^public/common/page_transition_types\\.cc$'], | |
| 542 ['include', '^public/common/speech_recognition_result\\.cc$'], | |
| 543 ['include', '^public/common/url_constants\\.cc$'], | |
| 544 ['include', '^common/content_paths\\.cc$'], | |
| 545 ['include', '^common/net/url_fetcher\\.cc$'], | |
| 546 ['include', '^common/net/url_request_user_data\\.cc$'], | |
| 547 ['include', '^common/savable_url_schemes\\.cc$'], | |
| 548 ['include', '^common/url_schemes\\.cc$'], | |
| 549 ], | |
| 550 }], | |
| 528 ], | 551 ], |
| 529 } | 552 } |
| OLD | NEW |