From e2cd93973b8fe2406f09d8e935d1d77ca13d3315 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 29 Oct 2013 01:32:19 +0000 Subject: [PATCH] ui: Have shell_dialogs into its own gyp file under its shell_dialogs/ directory. This is the pattern we follow for projects under ui/, each top-level directory (app_list, aura, compositor, events) have its own gyp file for its main target (library). BUG=299841 TEST=build/gyp_chromium, ninja -C out/Debug shell_dialogs, and other targets still build. R=ben@chromium.org Review URL: https://codereview.chromium.org/47323002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@231478 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- all.gyp | 12 ++++++------ all_android.gyp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/all.gyp b/all.gyp index 50dc18429..43ac284e5 100644 --- a/all.gyp +++ b/all.gyp @@ -222,7 +222,7 @@ '../crypto/crypto.gyp:crypto_unittests', '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', - '../ui/ui.gyp:ui_unittests', + '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', ], 'conditions': [ @@ -626,7 +626,7 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', - '../ui/ui.gyp:ui_unittests', + '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', ], @@ -659,7 +659,7 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', - '../ui/ui.gyp:ui_unittests', + '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', ], @@ -712,7 +712,7 @@ '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', - '../ui/ui.gyp:ui_unittests', + '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', ], }, @@ -759,7 +759,7 @@ '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', - '../ui/ui.gyp:ui_unittests', + '../ui/ui_unittests.gyp:ui_unittests', '../ui/views/views.gyp:views_unittests', '../url/url.gyp:url_unittests', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', @@ -924,7 +924,7 @@ '../ui/aura/aura.gyp:*', '../ui/compositor/compositor.gyp:*', '../ui/message_center/message_center.gyp:*', - '../ui/ui.gyp:ui_unittests', + '../ui/ui_unittests.gyp:ui_unittests', '../ui/snapshot/snapshot.gyp:snapshot_unittests', '../ui/views/views.gyp:views', '../ui/views/views.gyp:views_examples_with_content_exe', diff --git a/all_android.gyp b/all_android.gyp index 6514c8320..d8557500b 100644 --- a/all_android.gyp +++ b/all_android.gyp @@ -81,7 +81,7 @@ '../tools/android/android_tools.gyp:android_tools', '../tools/android/android_tools.gyp:memconsumer', '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test', - '../ui/ui.gyp:ui_unittests', + '../ui/ui_unittests.gyp:ui_unittests', # Required by ui_unittests. # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but # this would cause circular gyp dependency which needs refactoring the @@ -109,7 +109,7 @@ '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', '../sql/sql.gyp:sql_unittests_apk', '../sync/sync.gyp:sync_unit_tests_apk', - '../ui/ui.gyp:ui_unittests_apk', + '../ui/ui_unittests.gyp:ui_unittests_apk', '../android_webview/android_webview.gyp:android_webview_test_apk', '../chrome/chrome.gyp:chromium_testshell_test_apk', '../chrome/chrome.gyp:chromium_testshell_uiautomator_tests',