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

Side by Side Diff: build/all.gyp

Issue 759433002: Reland: Move TouchSelectionController from content to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed more reviewers' comments Created 6 years 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
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 18 matching lines...) Expand all
29 '../third_party/libxml/libxml.gyp:*', 29 '../third_party/libxml/libxml.gyp:*',
30 '../third_party/sqlite/sqlite.gyp:*', 30 '../third_party/sqlite/sqlite.gyp:*',
31 '../third_party/zlib/zlib.gyp:*', 31 '../third_party/zlib/zlib.gyp:*',
32 '../ui/accessibility/accessibility.gyp:*', 32 '../ui/accessibility/accessibility.gyp:*',
33 '../ui/base/ui_base.gyp:*', 33 '../ui/base/ui_base.gyp:*',
34 '../ui/display/display.gyp:display_unittests', 34 '../ui/display/display.gyp:display_unittests',
35 '../ui/snapshot/snapshot.gyp:*', 35 '../ui/snapshot/snapshot.gyp:*',
36 '../url/url.gyp:*', 36 '../url/url.gyp:*',
37 ], 37 ],
38 'conditions': [ 38 'conditions': [
39 ['OS!="ios" and OS!="mac"', {
40 'dependencies': [
41 '../ui/touch_selection/ui_touch_selection.gyp:*',
42 ],
43 }],
39 ['OS=="ios"', { 44 ['OS=="ios"', {
40 'dependencies': [ 45 'dependencies': [
41 '../ios/ios.gyp:*', 46 '../ios/ios.gyp:*',
42 # NOTE: This list of targets is present because 47 # NOTE: This list of targets is present because
43 # mojo_base.gyp:mojo_base cannot be built on iOS, as 48 # mojo_base.gyp:mojo_base cannot be built on iOS, as
44 # javascript-related targets cause v8 to be built. 49 # javascript-related targets cause v8 to be built.
45 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_bindings_unittests', 50 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
46 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_environment_unittests', 51 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_environment_unittests',
47 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_perftests', 52 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_perftests',
48 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_unittests', 53 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_unittests',
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps', 831 '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps',
827 '../sql/sql.gyp:sql_unittests', 832 '../sql/sql.gyp:sql_unittests',
828 '../sync/sync.gyp:sync_unit_tests', 833 '../sync/sync.gyp:sync_unit_tests',
829 '../testing/android/junit/junit_test.gyp:junit_unit_tests', 834 '../testing/android/junit/junit_test.gyp:junit_unit_tests',
830 '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittes ts', 835 '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittes ts',
831 '../third_party/WebKit/public/all.gyp:*', 836 '../third_party/WebKit/public/all.gyp:*',
832 '../tools/android/android_tools.gyp:android_tools', 837 '../tools/android/android_tools.gyp:android_tools',
833 '../tools/android/android_tools.gyp:memconsumer', 838 '../tools/android/android_tools.gyp:memconsumer',
834 '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugi n_test', 839 '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugi n_test',
835 '../ui/base/ui_base_tests.gyp:ui_base_unittests', 840 '../ui/base/ui_base_tests.gyp:ui_base_unittests',
836 '../ui/events/events.gyp:events_unittests', 841 '../ui/events/events.gyp:events_unittests',
jdduke (slow) 2014/12/02 21:07:15 Don't we need to add the touch_selection unittests
mohsen 2014/12/02 21:14:04 Yep, I'll probably need to add it here and some ot
837 # Unit test bundles packaged as an apk. 842 # Unit test bundles packaged as an apk.
838 '../android_webview/android_webview.gyp:android_webview_test_apk', 843 '../android_webview/android_webview.gyp:android_webview_test_apk',
839 '../android_webview/android_webview.gyp:android_webview_unittests_ap k', 844 '../android_webview/android_webview.gyp:android_webview_unittests_ap k',
840 '../base/base.gyp:base_unittests_apk', 845 '../base/base.gyp:base_unittests_apk',
841 '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests_apk', 846 '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests_apk',
842 '../cc/cc_tests.gyp:cc_unittests_apk', 847 '../cc/cc_tests.gyp:cc_unittests_apk',
843 '../chrome/chrome.gyp:chrome_shell_test_apk', 848 '../chrome/chrome.gyp:chrome_shell_test_apk',
844 '../chrome/chrome.gyp:chrome_sync_shell_test_apk', 849 '../chrome/chrome.gyp:chrome_sync_shell_test_apk',
845 '../chrome/chrome.gyp:chrome_shell_uiautomator_tests', 850 '../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
846 '../chrome/chrome.gyp:unit_tests_apk', 851 '../chrome/chrome.gyp:unit_tests_apk',
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 'dependencies': [ 1384 'dependencies': [
1380 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1385 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1381 '../ui/views/views.gyp:views', 1386 '../ui/views/views.gyp:views',
1382 '../ui/views/views.gyp:views_unittests', 1387 '../ui/views/views.gyp:views_unittests',
1383 ], 1388 ],
1384 }, # target_name: macviews_builder 1389 }, # target_name: macviews_builder
1385 ], # targets 1390 ], # targets
1386 }], # os=='mac' and toolkit_views==1 1391 }], # os=='mac' and toolkit_views==1
1387 ], # conditions 1392 ], # conditions
1388 } 1393 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698