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

Unified Diff: build/all.gyp

Issue 522843002: Revert of ui: Move ui_unittests.gyp into ui/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/pylib/gtest/setup.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index 4c1b42311148ab4c2e9983c5a25e29a392e1d4c5..e6d2446614332ac238f7d2866fe7d62a6d14208c 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -39,8 +39,8 @@
['OS=="ios"', {
'dependencies': [
'../ios/ios.gyp:*',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
+ '../ui/ui_unittests.gyp:ui_unittests',
],
}],
['OS=="android"', {
@@ -269,9 +269,9 @@
'../net/net.gyp:net_unittests',
'../sql/sql.gyp:sql_unittests',
'../sync/sync.gyp:sync_unit_tests',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/display/display.gyp:display_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
+ '../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
],
'conditions': [
@@ -769,8 +769,8 @@
'../tools/android/android_tools.gyp:android_tools',
'../tools/android/android_tools.gyp:memconsumer',
'../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/events/events.gyp:events_unittests',
+ '../ui/ui_unittests.gyp:ui_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',
@@ -794,9 +794,9 @@
'../sql/sql.gyp:sql_unittests_apk',
'../sync/sync.gyp:sync_unit_tests_apk',
'../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unittests_apk',
- '../ui/base/ui_base_tests.gyp:ui_unittests_apk',
'../ui/events/events.gyp:events_unittests_apk',
'../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
+ '../ui/ui_unittests.gyp:ui_unittests_apk',
],
},
{
@@ -878,8 +878,8 @@
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
'../tools/telemetry/telemetry.gyp:*',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
+ '../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
],
},
@@ -915,8 +915,8 @@
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
'../tools/telemetry/telemetry.gyp:*',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
+ '../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
],
},
@@ -963,8 +963,8 @@
'../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
+ '../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
],
},
@@ -1014,9 +1014,9 @@
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
'../tools/telemetry/telemetry.gyp:*',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/events/events.gyp:events_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
+ '../ui/ui_unittests.gyp:ui_unittests',
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:url_unittests',
],
@@ -1156,8 +1156,8 @@
'../sql/sql.gyp:sql_unittests',
'../sync/sync.gyp:sync_unit_tests',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
+ '../ui/ui_unittests.gyp:ui_unittests',
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:url_unittests',
],
@@ -1200,7 +1200,6 @@
'../remoting/remoting.gyp:remoting_unittests',
'../ui/app_list/app_list.gyp:*',
'../ui/aura/aura.gyp:*',
- '../ui/base/ui_base_tests.gyp:ui_unittests',
'../ui/compositor/compositor.gyp:*',
'../ui/display/display.gyp:display_unittests',
'../ui/events/events.gyp:*',
@@ -1208,6 +1207,7 @@
'../ui/keyboard/keyboard.gyp:*',
'../ui/message_center/message_center.gyp:*',
'../ui/snapshot/snapshot.gyp:snapshot_unittests',
+ '../ui/ui_unittests.gyp:ui_unittests',
'../ui/views/examples/examples.gyp:views_examples_with_content_exe',
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_unittests',
« no previous file with comments | « no previous file | build/android/pylib/gtest/setup.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698