| 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'. | 8 # compilation targets to 'All'. |
| 9 'app_targets%': [], | 9 'app_targets%': [], |
| 10 # For Android-specific targets. | 10 # For Android-specific targets. |
| (...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 877 '../android_webview/android_webview.gyp:android_webview_test_apk
', | 877 '../android_webview/android_webview.gyp:android_webview_test_apk
', |
| 878 '../android_webview/android_webview.gyp:android_webview_unittest
s_apk', | 878 '../android_webview/android_webview.gyp:android_webview_unittest
s_apk', |
| 879 '../chrome/chrome.gyp:chrome_junit_tests', | 879 '../chrome/chrome.gyp:chrome_junit_tests', |
| 880 '../chrome/chrome.gyp:chrome_shell_test_apk', | 880 '../chrome/chrome.gyp:chrome_shell_test_apk', |
| 881 '../chrome/chrome.gyp:chrome_sync_shell_test_apk', | 881 '../chrome/chrome.gyp:chrome_sync_shell_test_apk', |
| 882 '../chrome/chrome.gyp:chrome_shell_uiautomator_tests', | 882 '../chrome/chrome.gyp:chrome_shell_uiautomator_tests', |
| 883 '../chrome/chrome.gyp:chromedriver_webview_shell_apk', | 883 '../chrome/chrome.gyp:chromedriver_webview_shell_apk', |
| 884 '../chrome/chrome.gyp:unit_tests_apk', | 884 '../chrome/chrome.gyp:unit_tests_apk', |
| 885 ], | 885 ], |
| 886 }], | 886 }], |
| 887 ['enable_webrtc==1 and "<(libpeer_target_type)"=="static_library"',
{ | |
| 888 'dependencies': [ | |
| 889 '../components/devtools_bridge.gyp:devtools_bridge_tests_apk', | |
| 890 ], | |
| 891 }], | |
| 892 ], | 887 ], |
| 893 }, | 888 }, |
| 894 { | 889 { |
| 895 # WebRTC Chromium tests to run on Android. | 890 # WebRTC Chromium tests to run on Android. |
| 896 'target_name': 'android_builder_chromium_webrtc', | 891 'target_name': 'android_builder_chromium_webrtc', |
| 897 'type': 'none', | 892 'type': 'none', |
| 898 'dependencies': [ | 893 'dependencies': [ |
| 899 '../build/android/pylib/device/commands/commands.gyp:chromium_comman
ds', | 894 '../build/android/pylib/device/commands/commands.gyp:chromium_comman
ds', |
| 900 '../content/content_shell_and_tests.gyp:content_browsertests', | 895 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 901 '../tools/android/android_tools.gyp:android_tools', | 896 '../tools/android/android_tools.gyp:android_tools', |
| 902 '../tools/android/android_tools.gyp:memconsumer', | 897 '../tools/android/android_tools.gyp:memconsumer', |
| 903 # Unit test bundles packaged as an apk. | |
| 904 '../components/devtools_bridge.gyp:devtools_bridge_tests_apk', | |
| 905 '../content/content_shell_and_tests.gyp:content_browsertests_apk', | 898 '../content/content_shell_and_tests.gyp:content_browsertests_apk', |
| 906 ], | 899 ], |
| 907 }, # target_name: android_builder_chromium_webrtc | 900 }, # target_name: android_builder_chromium_webrtc |
| 908 ], # targets | 901 ], # targets |
| 909 }], # OS="android" | 902 }], # OS="android" |
| 910 ['OS=="mac"', { | 903 ['OS=="mac"', { |
| 911 'targets': [ | 904 'targets': [ |
| 912 { | 905 { |
| 913 # Target to build everything plus the dmg. We don't put the dmg | 906 # Target to build everything plus the dmg. We don't put the dmg |
| 914 # in the All target because developers really don't need it. | 907 # in the All target because developers really don't need it. |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1404 'dependencies': [ | 1397 'dependencies': [ |
| 1405 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1398 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1406 '../ui/views/views.gyp:views', | 1399 '../ui/views/views.gyp:views', |
| 1407 '../ui/views/views.gyp:views_unittests', | 1400 '../ui/views/views.gyp:views_unittests', |
| 1408 ], | 1401 ], |
| 1409 }, # target_name: macviews_builder | 1402 }, # target_name: macviews_builder |
| 1410 ], # targets | 1403 ], # targets |
| 1411 }], # os=='mac' and toolkit_views==1 | 1404 }], # os=='mac' and toolkit_views==1 |
| 1412 ], # conditions | 1405 ], # conditions |
| 1413 } | 1406 } |
| OLD | NEW |