summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 10:20:37 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 10:20:37 +0000
commited8fd9152e0dff6c26f69f968e0d4aa4bd890d57 (patch)
tree163fe12566ebad286d91d12820f078b240e2db26 /android_webview
parent4795329fcd7308914fcdbee6f824c250cfae2629 (diff)
downloadchromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.zip
chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.tar.gz
chromium_src-ed8fd9152e0dff6c26f69f968e0d4aa4bd890d57.tar.bz2
Move ui.gyp into ui/base/ directory.
This follows the rule we setup for //ui which states that each subdir should be its own component with its own gyp file that lives in its subdir. The 'ui' target was renamed to ui_base to match the convention. BUG=299841 TEST=gyp files. TBR=ben@chromium.org Review URL: https://codereview.chromium.org/198333004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/android_webview_tests.gypi2
-rw-r--r--android_webview/native/webview_native.gyp2
2 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index f2be536..18fcbe1 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -86,7 +86,7 @@
'../testing/android/native_test.gyp:native_test_native_code',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../ui/ui.gyp:ui_base_jni_headers',
+ '../ui/base/ui_base.gyp:ui_base_jni_headers',
'android_webview_common',
'android_webview_unittests_jni',
],
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index a6269a1..27d599a 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -18,9 +18,9 @@
'../../content/content.gyp:content_common',
'../../net/net.gyp:net',
'../../skia/skia.gyp:skia',
+ '../../ui/base/ui_base.gyp:ui_base',
'../../ui/gfx/gfx.gyp:gfx',
'../../ui/gfx/gfx.gyp:gfx_geometry',
- '../../ui/ui.gyp:ui',
'../../webkit/common/webkit_common.gyp:webkit_common',
'../../webkit/storage_browser.gyp:webkit_storage_browser',
'../../webkit/storage_common.gyp:webkit_storage_common',