Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: ui/ui.gyp

Issue 8497054: Upstream: ui implementation in Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: init Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/gfx/platform_font_android.cc ('K') | « ui/gfx/platform_font_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 24180593b1481fe7fe9c78b4eeef9767958201f2..6cc3c09fa62e39e2ef9e38fc55ba6cd55965da1c 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -174,6 +174,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',
@@ -222,6 +223,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',
@@ -254,6 +256,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',
@@ -494,6 +498,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': [
« ui/gfx/platform_font_android.cc ('K') | « ui/gfx/platform_font_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698