summaryrefslogtreecommitdiffstats
path: root/ui/ui.gyp
diff options
context:
space:
mode:
authormichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 20:38:37 +0000
committermichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 20:38:37 +0000
commit9a49c05d1a3d2cab75cb4041e400d8ccce456bae (patch)
tree2d737f40772ee339d019d4b3a1040d80b385b5d9 /ui/ui.gyp
parentd502b0db315493620f37e43cab3fb5e2f1329b18 (diff)
downloadchromium_src-9a49c05d1a3d2cab75cb4041e400d8ccce456bae.zip
chromium_src-9a49c05d1a3d2cab75cb4041e400d8ccce456bae.tar.gz
chromium_src-9a49c05d1a3d2cab75cb4041e400d8ccce456bae.tar.bz2
Upstream: ui implementation in Android
Review URL: http://codereview.chromium.org/8497054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
-rw-r--r--ui/ui.gyp12
1 files changed, 12 insertions, 0 deletions
diff --git a/ui/ui.gyp b/ui/ui.gyp
index dfb93df..b1ae255 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -180,6 +180,7 @@
'base/resource/data_pack.h',
'base/resource/resource_bundle.cc',
'base/resource/resource_bundle.h',
+ 'base/resource/resource_bundle_android.cc',
'base/resource/resource_bundle_aurax11.cc',
'base/resource/resource_bundle_gtk.cc',
'base/resource/resource_bundle_linux.cc',
@@ -228,6 +229,7 @@
'gfx/canvas.h',
'gfx/canvas_skia.h',
'gfx/canvas_skia.cc',
+ 'gfx/canvas_skia_android.cc',
'gfx/canvas_skia_linux.cc',
'gfx/canvas_skia_mac.mm',
'gfx/canvas_skia_paint.h',
@@ -260,6 +262,8 @@
'gfx/mac/scoped_ns_disable_screen_updates.h',
'gfx/native_theme.cc',
'gfx/native_theme.h',
+ 'gfx/native_theme_android.cc',
+ 'gfx/native_theme_android.h',
'gfx/native_theme_aura.cc',
'gfx/native_theme_aura.h',
'gfx/native_theme_base.cc',
@@ -507,6 +511,14 @@
],
},
}],
+ ['OS=="android"', {
+ 'sources!': [
+ 'gfx/pango_util.h',
+ 'gfx/pango_util.cc',
+ 'gfx/platform_font_pango.h',
+ 'gfx/platform_font_pango.cc',
+ ],
+ }],
['use_x11==1', {
'all_dependent_settings': {
'ldflags': [