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 '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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 822 { | 822 { |
| 823 # WebRTC Chromium tests to run on Android. | 823 # WebRTC Chromium tests to run on Android. |
| 824 'target_name': 'android_builder_chromium_webrtc', | 824 'target_name': 'android_builder_chromium_webrtc', |
| 825 'type': 'none', | 825 'type': 'none', |
| 826 'dependencies': [ | 826 'dependencies': [ |
| 827 '../content/content_shell_and_tests.gyp:content_browsertests', | 827 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 828 '../tools/android/android_tools.gyp:android_tools', | 828 '../tools/android/android_tools.gyp:android_tools', |
| 829 '../tools/android/android_tools.gyp:memconsumer', | 829 '../tools/android/android_tools.gyp:memconsumer', |
| 830 # Unit test bundles packaged as an apk. | 830 # Unit test bundles packaged as an apk. |
| 831 '../content/content_shell_and_tests.gyp:content_browsertests_apk', | 831 '../content/content_shell_and_tests.gyp:content_browsertests_apk', |
| 832 '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection_jav alib', | |
|
kjellander_chromium
2014/10/01 18:44:10
Move this line up above the comment since it's not
SeRya
2014/10/01 21:05:16
Done.
| |
| 832 ], | 833 ], |
| 833 }, # target_name: android_builder_chromium_webrtc | 834 }, # target_name: android_builder_chromium_webrtc |
| 834 ], # targets | 835 ], # targets |
| 835 }], # OS="android" | 836 }], # OS="android" |
| 836 ['OS=="mac"', { | 837 ['OS=="mac"', { |
| 837 'targets': [ | 838 'targets': [ |
| 838 { | 839 { |
| 839 # Target to build everything plus the dmg. We don't put the dmg | 840 # Target to build everything plus the dmg. We don't put the dmg |
| 840 # in the All target because developers really don't need it. | 841 # in the All target because developers really don't need it. |
| 841 'target_name': 'all_and_dmg', | 842 'target_name': 'all_and_dmg', |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1311 'dependencies': [ | 1312 'dependencies': [ |
| 1312 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1313 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1313 '../ui/views/views.gyp:views', | 1314 '../ui/views/views.gyp:views', |
| 1314 '../ui/views/views.gyp:views_unittests', | 1315 '../ui/views/views.gyp:views_unittests', |
| 1315 ], | 1316 ], |
| 1316 }, # target_name: macviews_builder | 1317 }, # target_name: macviews_builder |
| 1317 ], # targets | 1318 ], # targets |
| 1318 }], # os=='mac' and toolkit_views==1 | 1319 }], # os=='mac' and toolkit_views==1 |
| 1319 ], # conditions | 1320 ], # conditions |
| 1320 } | 1321 } |
| OLD | NEW |