| 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 'variables': { | 6 'variables': { |
| 7 # A hook that can be overridden in other repositories to add additional | 7 # A hook that can be overridden in other repositories to add additional |
| 8 # compilation targets to 'All'. Only used on Android. | 8 # compilation targets to 'All'. Only used on Android. |
| 9 'android_app_targets%': [], | 9 'android_app_targets%': [], |
| 10 }, | 10 }, |
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 849 '../sync/sync.gyp:sync_unit_tests_apk', | 849 '../sync/sync.gyp:sync_unit_tests_apk', |
| 850 '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unit
tests_apk', | 850 '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unit
tests_apk', |
| 851 '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk', | 851 '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk', |
| 852 '../ui/events/events.gyp:events_unittests_apk', | 852 '../ui/events/events.gyp:events_unittests_apk', |
| 853 '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', | 853 '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', |
| 854 ], | 854 ], |
| 855 'conditions': [ | 855 'conditions': [ |
| 856 ['enable_webrtc==1 and "<(libpeer_target_type)"=="static_library"',
{ | 856 ['enable_webrtc==1 and "<(libpeer_target_type)"=="static_library"',
{ |
| 857 'dependencies': [ | 857 'dependencies': [ |
| 858 '../components/devtools_bridge.gyp:devtools_bridge_tests_apk', | 858 '../components/devtools_bridge.gyp:devtools_bridge_tests_apk', |
| 859 '../components/devtools_bridge.gyp:libdevtools_bridge_browsertes
ts', |
| 859 ], | 860 ], |
| 860 }], | 861 }], |
| 861 ], | 862 ], |
| 862 }, | 863 }, |
| 863 { | 864 { |
| 864 # WebRTC Chromium tests to run on Android. | 865 # WebRTC Chromium tests to run on Android. |
| 865 'target_name': 'android_builder_chromium_webrtc', | 866 'target_name': 'android_builder_chromium_webrtc', |
| 866 'type': 'none', | 867 'type': 'none', |
| 867 'dependencies': [ | 868 'dependencies': [ |
| 868 '../build/android/pylib/device/commands/commands.gyp:chromium_comman
ds', | 869 '../build/android/pylib/device/commands/commands.gyp:chromium_comman
ds', |
| 869 '../content/content_shell_and_tests.gyp:content_browsertests', | 870 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 870 '../tools/android/android_tools.gyp:android_tools', | 871 '../tools/android/android_tools.gyp:android_tools', |
| 871 '../tools/android/android_tools.gyp:memconsumer', | 872 '../tools/android/android_tools.gyp:memconsumer', |
| 872 # Unit test bundles packaged as an apk. | 873 # Unit test bundles packaged as an apk. |
| 873 '../components/devtools_bridge.gyp:devtools_bridge_tests_apk', | 874 '../components/devtools_bridge.gyp:devtools_bridge_tests_apk', |
| 875 '../components/devtools_bridge.gyp:libdevtools_bridge_browsertests', |
| 874 '../content/content_shell_and_tests.gyp:content_browsertests_apk', | 876 '../content/content_shell_and_tests.gyp:content_browsertests_apk', |
| 875 ], | 877 ], |
| 876 }, # target_name: android_builder_chromium_webrtc | 878 }, # target_name: android_builder_chromium_webrtc |
| 877 ], # targets | 879 ], # targets |
| 878 }], # OS="android" | 880 }], # OS="android" |
| 879 ['OS=="mac"', { | 881 ['OS=="mac"', { |
| 880 'targets': [ | 882 'targets': [ |
| 881 { | 883 { |
| 882 # Target to build everything plus the dmg. We don't put the dmg | 884 # Target to build everything plus the dmg. We don't put the dmg |
| 883 # in the All target because developers really don't need it. | 885 # in the All target because developers really don't need it. |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1366 'dependencies': [ | 1368 'dependencies': [ |
| 1367 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1369 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1368 '../ui/views/views.gyp:views', | 1370 '../ui/views/views.gyp:views', |
| 1369 '../ui/views/views.gyp:views_unittests', | 1371 '../ui/views/views.gyp:views_unittests', |
| 1370 ], | 1372 ], |
| 1371 }, # target_name: macviews_builder | 1373 }, # target_name: macviews_builder |
| 1372 ], # targets | 1374 ], # targets |
| 1373 }], # os=='mac' and toolkit_views==1 | 1375 }], # os=='mac' and toolkit_views==1 |
| 1374 ], # conditions | 1376 ], # conditions |
| 1375 } | 1377 } |
| OLD | NEW |