| Index: ui/ui.gyp
 | 
| diff --git a/ui/ui.gyp b/ui/ui.gyp
 | 
| index 167657c27bbbc2efbb1fe1c2cfad00b1ae1ea49a..fe3e194ea6f502184a61cd0892ce9310bfece00e 100644
 | 
| --- a/ui/ui.gyp
 | 
| +++ b/ui/ui.gyp
 | 
| @@ -75,6 +75,8 @@
 | 
|        ],
 | 
|        'all_sources': [
 | 
|          '<@(_common_sources)',
 | 
| +        'android/ui_jni_registrar.cc',
 | 
| +        'android/ui_jni_registrar.h',
 | 
|          'base/accelerators/accelerator.cc',
 | 
|          'base/accelerators/accelerator.h',
 | 
|          'base/accelerators/accelerator_cocoa.h',
 | 
| @@ -149,6 +151,8 @@
 | 
|          'base/dialogs/gtk/select_file_dialog_impl_kde.cc',
 | 
|          'base/dialogs/select_file_dialog.cc',
 | 
|          'base/dialogs/select_file_dialog.h',
 | 
| +        'base/dialogs/select_file_dialog_android.cc',
 | 
| +        'base/dialogs/select_file_dialog_android.h',
 | 
|          'base/dialogs/select_file_dialog_factory.cc',
 | 
|          'base/dialogs/select_file_dialog_factory.h',
 | 
|          'base/dialogs/select_file_dialog_mac.h',
 | 
| @@ -370,6 +374,8 @@
 | 
|          'gfx/android/gfx_jni_registrar.h',
 | 
|          'gfx/android/java_bitmap.cc',
 | 
|          'gfx/android/java_bitmap.h',
 | 
| +        'gfx/android/window_android.cc',
 | 
| +        'gfx/android/window_android.h',
 | 
|          'gfx/blit.cc',
 | 
|          'gfx/blit.h',
 | 
|          'gfx/canvas.cc',
 | 
| @@ -762,6 +768,13 @@
 | 
|              'gfx/platform_font_pango.cc',
 | 
|              'gfx/platform_font_pango.h',
 | 
|            ],
 | 
| +          'dependencies': [
 | 
| +            'ui_java',
 | 
| +            'ui_jni_headers',
 | 
| +          ],
 | 
| +          'include_dirs': [
 | 
| +            '<(SHARED_INTERMEDIATE_DIR)/ui',
 | 
| +          ],
 | 
|          }],
 | 
|          ['OS=="android" or OS=="ios"', {
 | 
|            'sources!': [
 | 
| @@ -788,5 +801,36 @@
 | 
|          'ui_unittests.gypi',
 | 
|        ]},
 | 
|      ],
 | 
| +    ['OS=="android"' , {
 | 
| +       'targets': [
 | 
| +         {
 | 
| +           'target_name': 'ui_jni_headers',
 | 
| +           'type': 'none',
 | 
| +           'sources': [
 | 
| +             'android/java/src/org/chromium/ui/gfx/NativeWindow.java',
 | 
| +             'android/java/src/org/chromium/ui/SelectFileDialog.java',
 | 
| +           ],
 | 
| +           'variables': {
 | 
| +             'jni_gen_dir': 'ui',
 | 
| +           },
 | 
| +           'includes': [ '../build/jni_generator.gypi' ],
 | 
| +         },
 | 
| +         {
 | 
| +           'target_name': 'ui_java',
 | 
| +           'type': 'none',
 | 
| +           'variables': {
 | 
| +             'package_name': 'ui',
 | 
| +             'java_in_dir': '../ui/android/java',
 | 
| +           },
 | 
| +           'dependencies': [
 | 
| +             '../base/base.gyp:base_java',
 | 
| +           ],
 | 
| +           'export_dependent_settings': [
 | 
| +             '../base/base.gyp:base_java',
 | 
| +           ],
 | 
| +           'includes': [ '../build/java.gypi' ],
 | 
| +         },
 | 
| +       ],
 | 
| +    }],
 | 
|    ],
 | 
|  }
 | 
| 
 |