ui: Android changes.

ui/ui.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'ui_resources.gypi',
@@ skipping 36 matching lines @@
         'base/accelerators/platform_accelerator.h',
         'base/accelerators/platform_accelerator_cocoa.h',
         'base/accelerators/platform_accelerator_cocoa.mm',
         'base/accelerators/platform_accelerator_gtk.cc',
         'base/accelerators/platform_accelerator_gtk.h',
         'base/accessibility/accessibility_types.h',
         'base/accessibility/accessible_text_utils.cc',
         'base/accessibility/accessible_text_utils.h',
         'base/accessibility/accessible_view_state.cc',
         'base/accessibility/accessible_view_state.h',
-        'base/android/ui_jni_registrar.cc',
-        'base/android/ui_jni_registrar.h',
+        'base/android/ui_base_jni_registrar.cc',
+        'base/android/ui_base_jni_registrar.h',
         'base/android/view_android.cc',
         'base/android/view_android.h',
         'base/android/window_android.cc',
         'base/android/window_android.h',
         'base/base_window.cc',
         'base/base_window.h',
         'base/clipboard/clipboard.cc',
         'base/clipboard/clipboard.h',
         'base/clipboard/clipboard_android.cc',
         'base/clipboard/clipboard_android_initialization.h',
@@ skipping 485 matching lines @@
             'base/dragdrop/drag_utils.h',
             'base/l10n/l10n_font_util.cc',
             'base/models/button_menu_item_model.cc',
             'base/models/dialog_model.cc',
             'base/theme_provider.cc',
             'base/touch/touch_device.cc',
             'base/touch/touch_editing_controller.cc',
             'base/ui_base_types.cc',
           ],
           'dependencies': [
-            'ui_jni_headers',
+            'ui_base_jni_headers',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/ui',
           ],
           'link_settings': {
             'libraries': [
               '-ljnigraphics',
             ],
           },
         }],
         ['OS=="android" and android_webview_build==0', {
           'dependencies': [
-            'ui_java',
+            'android/ui_android.gyp:ui_java',
           ],
         }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
             'base/device_form_factor_desktop.cc'
           ],
         }],
         ['OS=="linux"', {
           'libraries': [
             '-ldl',
@@ skipping 26 matching lines @@
         'base/keycodes/keycode_converter.cc',
         'base/keycodes/keycode_converter.h',
         'base/keycodes/keycode_converter_data.h',
       ],
     }
   ],
   'conditions': [
     ['OS=="android"' , {
        'targets': [
          {
-           'target_name': 'ui_jni_headers',
+           'target_name': 'ui_base_jni_headers',
            'type': 'none',
            'direct_dependent_settings': {
              'include_dirs': [
                '<(SHARED_INTERMEDIATE_DIR)/ui',
              ],
            },
            'sources': [
-             'android/java/src/org/chromium/ui/Clipboard.java',
-             'android/java/src/org/chromium/ui/LocalizationUtils.java',
-             'android/java/src/org/chromium/ui/SelectFileDialog.java',
-             'android/java/src/org/chromium/ui/ViewAndroid.java',
-             'android/java/src/org/chromium/ui/WindowAndroid.java',
+             'android/java/src/org/chromium/ui/base/Clipboard.java',
+             'android/java/src/org/chromium/ui/base/LocalizationUtils.java',
+             'android/java/src/org/chromium/ui/base/SelectFileDialog.java',
+             'android/java/src/org/chromium/ui/base/ViewAndroid.java',
+             'android/java/src/org/chromium/ui/base/WindowAndroid.java',
            ],
            'variables': {
              'jni_gen_package': 'ui',
              'jni_generator_ptr_type': 'long',
            },
            'includes': [ '../build/jni_generator.gypi' ],
          },
-         {
-           'target_name': 'ui_java',
-           'type': 'none',
-           'variables': {
-             'java_in_dir': '../ui/android/java',
-             'has_java_resources': 1,
-             'R_package': 'org.chromium.ui',
-             'R_package_relpath': 'org/chromium/ui',
-             'java_strings_grd': 'android_ui_strings.grd',
-           },
-           'dependencies': [
-             '../base/base.gyp:base_java',
-             'window_open_disposition_java',
-           ],
-           'includes': [ '../build/java.gypi' ],
-         },
-         {
-           'target_name': 'window_open_disposition_java',
-           'type': 'none',
-           'sources': [
-             'android/java/WindowOpenDisposition.template',
-           ],
-           'variables': {
-             'package_name': 'org/chromium/ui',
-             'template_deps': ['base/window_open_disposition_list.h'],
-           },
-           'includes': [ '../build/android/java_cpp_template.gypi' ],
-         },
        ],
     }],
     ['OS=="mac"', {
       'targets': [
         {
           'target_name': 'ui_cocoa_third_party_toolkits',
           'type': '<(component)',
           'sources': [
             # Build Apple sample code
             '../third_party/apple_sample_code/ImageAndTextCell.h',
@@ skipping 54 matching lines @@
               'xcode_settings': {
                 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
               },
             }],
           ],
         },
       ],
     }],
   ],
 }