Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Side by Side Diff: build/all.gyp

Issue 1354213004: Revert of [Android] Remove old gtest test_runner code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/android/buildbot/bb_device_steps.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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. 786 # until the full set supported. If adding a new test here,
787 # please also add it to build/android/pylib/gtest/gtest_config.py,
788 # else the test is not run.
787 # 789 #
788 # WARNING: 790 # WARNING:
789 # Do not add targets here without communicating the implications 791 # Do not add targets here without communicating the implications
790 # on tryserver triggers and load. Discuss with 792 # on tryserver triggers and load. Discuss with
791 # chrome-infrastructure-team please. 793 # chrome-infrastructure-team please.
792 'target_name': 'android_builder_tests', 794 'target_name': 'android_builder_tests',
793 'type': 'none', 795 'type': 'none',
794 'dependencies': [ 796 'dependencies': [
795 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests ', 797 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests ',
796 '../base/base.gyp:base_unittests', 798 '../base/base.gyp:base_unittests',
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
1433 'dependencies': [ 1435 'dependencies': [
1434 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1436 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1435 '../ui/views/views.gyp:views', 1437 '../ui/views/views.gyp:views',
1436 '../ui/views/views.gyp:views_unittests', 1438 '../ui/views/views.gyp:views_unittests',
1437 ], 1439 ],
1438 }, # target_name: macviews_builder 1440 }, # target_name: macviews_builder
1439 ], # targets 1441 ], # targets
1440 }], # os=='mac' and toolkit_views==1 1442 }], # os=='mac' and toolkit_views==1
1441 ], # conditions 1443 ], # conditions
1442 } 1444 }
OLDNEW
« no previous file with comments | « no previous file | build/android/buildbot/bb_device_steps.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698