summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-15 17:52:54 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-15 17:52:54 +0000
commitf450287d9b98a4e05dee6c3f6081fc4c47df44b0 (patch)
tree0b80d79ae38dac9a0e0e638f954c73051cd8ca8c /chrome/chrome.gyp
parent703fe530a9caa267696aa7c3bc3a8dad1c4e5257 (diff)
downloadchromium_src-f450287d9b98a4e05dee6c3f6081fc4c47df44b0.zip
chromium_src-f450287d9b98a4e05dee6c3f6081fc4c47df44b0.tar.gz
chromium_src-f450287d9b98a4e05dee6c3f6081fc4c47df44b0.tar.bz2
ui: Android changes.
A series of changes related to android code organization under ui, that came after the discussion in https://codereview.chromium.org/62203014/. - Rename ui_jni_registrar.* to ui_base_jni_registrar.* - Create a base/ directory under ui/android/java/src/org/chromium/ui, and move some java files there. - Move Surface java files into ui/android/java/src/org/chromium/ui/gl/ directory. - Rename ui_jni_headers to ui_base_jni_headers. - Create a new ui_android.gyp file under ui/android to contain ui_java target. BUG=299841 R=tedchoc@chromium.org, yfriedman@chromium.org TBR=ben Review URL: https://codereview.chromium.org/70843003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 132bb3e..006c2f3 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1011,7 +1011,7 @@
'../printing/printing.gyp:printing_java',
'../sync/sync.gyp:sync_java',
'../third_party/guava/guava.gyp:guava_javalib',
- '../ui/ui.gyp:ui_java',
+ '../ui/android/ui_android.gyp:ui_java',
],
'variables': {
'java_in_dir': '../chrome/android/java',