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

Unified Diff: ui/ui.gyp

Issue 11065035: Don't make base/net/ui depend on their Java counterpart when building for webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing ui.gyp Created 8 years, 2 months 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
« no previous file with comments | « net/net.gyp ('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 a8cdcfff7405a3eca5eae1f5748191c13e25bdb1..90036defc5991eeead6f99ca5fc37230d9406781 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -798,12 +798,16 @@
'gfx/platform_font_pango.h',
],
'dependencies': [
- 'ui_java',
'ui_jni_headers',
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/ui',
],
+ }],
+ ['OS=="android" and android_build_type==0', {
+ 'dependencies': [
+ 'ui_java',
+ ],
'export_dependent_settings': [
'ui_java',
],
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698