| Index: build/all.gyp
|
| diff --git a/build/all.gyp b/build/all.gyp
|
| index 9c325fb4f05cd2d79a1a5a3fbe3aaa600771bc0f..4ab6cfb47ea7fcfd8e236f08caa32722543c724a 100644
|
| --- a/build/all.gyp
|
| +++ b/build/all.gyp
|
| @@ -36,6 +36,11 @@
|
| '../url/url.gyp:*',
|
| ],
|
| 'conditions': [
|
| + ['OS!="ios" and OS!="mac"', {
|
| + 'dependencies': [
|
| + '../ui/touch_selection/ui_touch_selection.gyp:*',
|
| + ],
|
| + }],
|
| ['OS=="ios"', {
|
| 'dependencies': [
|
| '../ios/ios.gyp:*',
|
| @@ -312,6 +317,11 @@
|
| '../url/url.gyp:url_unittests',
|
| ],
|
| 'conditions': [
|
| + ['OS!="ios" and OS!="mac"', {
|
| + 'dependencies': [
|
| + '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
|
| + ],
|
| + }],
|
| ['OS!="ios" and OS!="android"', {
|
| 'dependencies': [
|
| '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests',
|
| @@ -834,6 +844,7 @@
|
| '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests',
|
| '../ui/events/events.gyp:events_unittests',
|
| + '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
|
| # Unit test bundles packaged as an apk.
|
| '../android_webview/android_webview.gyp:android_webview_test_apk',
|
| '../android_webview/android_webview.gyp:android_webview_unittests_apk',
|
| @@ -862,6 +873,7 @@
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk',
|
| '../ui/events/events.gyp:events_unittests_apk',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
|
| + '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests_apk',
|
| ],
|
| 'conditions': [
|
| ['enable_webrtc==1 and "<(libpeer_target_type)"=="static_library"', {
|
| @@ -1075,6 +1087,7 @@
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests',
|
| '../ui/events/events.gyp:events_unittests',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests',
|
| + '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
|
| '../ui/views/views.gyp:views_unittests',
|
| '../url/url.gyp:url_unittests',
|
| ],
|
| @@ -1179,6 +1192,7 @@
|
| '../ui/events/events.gyp:events_unittests',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests',
|
| '../ui/keyboard/keyboard.gyp:keyboard_unittests',
|
| + '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
|
| '../url/url.gyp:url_unittests',
|
| ],
|
| },
|
| @@ -1219,6 +1233,7 @@
|
| '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
|
| '../ui/base/ui_base_tests.gyp:ui_base_unittests',
|
| '../ui/gfx/gfx_tests.gyp:gfx_unittests',
|
| + '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
|
| '../ui/views/views.gyp:views_unittests',
|
| '../url/url.gyp:url_unittests',
|
| ],
|
| @@ -1267,6 +1282,7 @@
|
| '../ui/keyboard/keyboard.gyp:*',
|
| '../ui/message_center/message_center.gyp:*',
|
| '../ui/snapshot/snapshot.gyp:snapshot_unittests',
|
| + '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
|
| '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
|
| '../ui/views/views.gyp:views',
|
| '../ui/views/views.gyp:views_unittests',
|
|
|