| 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 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 ] | 776 ] |
| 777 }], | 777 }], |
| 778 ], | 778 ], |
| 779 }, #target_name: chromium_builder_nacl_sdk | 779 }, #target_name: chromium_builder_nacl_sdk |
| 780 ], # targets | 780 ], # targets |
| 781 }], #OS!=ios and OS!=android | 781 }], #OS!=ios and OS!=android |
| 782 ['OS=="android"', { | 782 ['OS=="android"', { |
| 783 'targets': [ | 783 'targets': [ |
| 784 { | 784 { |
| 785 # The current list of tests for android. This is temporary | 785 # The current list of tests for android. This is temporary |
| 786 # until the full set supported. If adding a new test here, | 786 # until the full set supported. |
| 787 # please also add it to build/android/pylib/gtest/gtest_config.py, | |
| 788 # else the test is not run. | |
| 789 # | 787 # |
| 790 # WARNING: | 788 # WARNING: |
| 791 # Do not add targets here without communicating the implications | 789 # Do not add targets here without communicating the implications |
| 792 # on tryserver triggers and load. Discuss with | 790 # on tryserver triggers and load. Discuss with |
| 793 # chrome-infrastructure-team please. | 791 # chrome-infrastructure-team please. |
| 794 'target_name': 'android_builder_tests', | 792 'target_name': 'android_builder_tests', |
| 795 'type': 'none', | 793 'type': 'none', |
| 796 'dependencies': [ | 794 'dependencies': [ |
| 797 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests
', | 795 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests
', |
| 798 '../base/base.gyp:base_unittests', | 796 '../base/base.gyp:base_unittests', |
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1435 'dependencies': [ | 1433 'dependencies': [ |
| 1436 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1434 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1437 '../ui/views/views.gyp:views', | 1435 '../ui/views/views.gyp:views', |
| 1438 '../ui/views/views.gyp:views_unittests', | 1436 '../ui/views/views.gyp:views_unittests', |
| 1439 ], | 1437 ], |
| 1440 }, # target_name: macviews_builder | 1438 }, # target_name: macviews_builder |
| 1441 ], # targets | 1439 ], # targets |
| 1442 }], # os=='mac' and toolkit_views==1 | 1440 }], # os=='mac' and toolkit_views==1 |
| 1443 ], # conditions | 1441 ], # conditions |
| 1444 } | 1442 } |
| OLD | NEW |