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

Side by Side Diff: build/all.gyp

Issue 597123002: Revert of [Android] JUnit runner + gyp changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@deps-changes
Patch Set: Created 6 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/gyp/jar.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'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 '../content/content_shell_and_tests.gyp:content_unittests', 780 '../content/content_shell_and_tests.gyp:content_unittests',
781 '../gpu/gpu.gyp:gl_tests', 781 '../gpu/gpu.gyp:gl_tests',
782 '../gpu/gpu.gyp:gpu_unittests', 782 '../gpu/gpu.gyp:gpu_unittests',
783 '../ipc/ipc.gyp:ipc_tests', 783 '../ipc/ipc.gyp:ipc_tests',
784 '../media/media.gyp:media_perftests_apk', 784 '../media/media.gyp:media_perftests_apk',
785 '../media/media.gyp:media_unittests', 785 '../media/media.gyp:media_unittests',
786 '../net/net.gyp:net_unittests', 786 '../net/net.gyp:net_unittests',
787 '../sandbox/sandbox.gyp:sandbox_linux_unittests_stripped', 787 '../sandbox/sandbox.gyp:sandbox_linux_unittests_stripped',
788 '../sql/sql.gyp:sql_unittests', 788 '../sql/sql.gyp:sql_unittests',
789 '../sync/sync.gyp:sync_unit_tests', 789 '../sync/sync.gyp:sync_unit_tests',
790 '../testing/android/junit/junit_test.gyp:junit_unit_tests',
791 '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittes ts', 790 '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittes ts',
792 '../third_party/WebKit/public/all.gyp:*', 791 '../third_party/WebKit/public/all.gyp:*',
793 '../tools/android/android_tools.gyp:android_tools', 792 '../tools/android/android_tools.gyp:android_tools',
794 '../tools/android/android_tools.gyp:memconsumer', 793 '../tools/android/android_tools.gyp:memconsumer',
795 '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugi n_test', 794 '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugi n_test',
796 '../ui/base/ui_base_tests.gyp:ui_unittests', 795 '../ui/base/ui_base_tests.gyp:ui_unittests',
797 '../ui/events/events.gyp:events_unittests', 796 '../ui/events/events.gyp:events_unittests',
798 # Unit test bundles packaged as an apk. 797 # Unit test bundles packaged as an apk.
799 '../android_webview/android_webview.gyp:android_webview_test_apk', 798 '../android_webview/android_webview.gyp:android_webview_test_apk',
800 '../android_webview/android_webview.gyp:android_webview_unittests_ap k', 799 '../android_webview/android_webview.gyp:android_webview_unittests_ap k',
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 'dependencies': [ 1311 'dependencies': [
1313 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1312 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1314 '../ui/views/views.gyp:views', 1313 '../ui/views/views.gyp:views',
1315 '../ui/views/views.gyp:views_unittests', 1314 '../ui/views/views.gyp:views_unittests',
1316 ], 1315 ],
1317 }, # target_name: macviews_builder 1316 }, # target_name: macviews_builder
1318 ], # targets 1317 ], # targets
1319 }], # os=='mac' and toolkit_views==1 1318 }], # os=='mac' and toolkit_views==1
1320 ], # conditions 1319 ], # conditions
1321 } 1320 }
OLDNEW
« no previous file with comments | « no previous file | build/android/gyp/jar.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698