Chromium Code Reviews| Index: ui/ui.gyp |
| diff --git a/ui/ui.gyp b/ui/ui.gyp |
| index 167657c27bbbc2efbb1fe1c2cfad00b1ae1ea49a..ee95875932d351e9cd819b878f428805986d685f 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', |
| @@ -139,6 +141,8 @@ |
| 'base/cursor/cursor.h', |
| 'base/cursor/cursor_win.cc', |
| 'base/cursor/cursor_x11.cc', |
| + 'base/dialogs/android/select_file_dialog_android.cc', |
|
Yaron
2012/09/12 19:14:45
You don't really need the /android/ dir. This can
|
| + 'base/dialogs/android/select_file_dialog_android.h', |
| 'base/dialogs/base_shell_dialog.cc', |
| 'base/dialogs/base_shell_dialog.h', |
| 'base/dialogs/base_shell_dialog_win.cc', |
| @@ -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' ], |
| + }, |
| + ], |
| + }], |
| ], |
| } |