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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 'base/dragdrop/drag_utils.cc', 791 'base/dragdrop/drag_utils.cc',
792 'base/dragdrop/drag_utils.h', 792 'base/dragdrop/drag_utils.h',
793 'base/touch/touch_factory.cc', 793 'base/touch/touch_factory.cc',
794 'base/touch/touch_factory.h', 794 'base/touch/touch_factory.h',
795 'gfx/pango_util.cc', 795 'gfx/pango_util.cc',
796 'gfx/pango_util.h', 796 'gfx/pango_util.h',
797 'gfx/platform_font_pango.cc', 797 'gfx/platform_font_pango.cc',
798 'gfx/platform_font_pango.h', 798 'gfx/platform_font_pango.h',
799 ], 799 ],
800 'dependencies': [ 800 'dependencies': [
801 'ui_java',
802 'ui_jni_headers', 801 'ui_jni_headers',
803 ], 802 ],
804 'include_dirs': [ 803 'include_dirs': [
805 '<(SHARED_INTERMEDIATE_DIR)/ui', 804 '<(SHARED_INTERMEDIATE_DIR)/ui',
806 ], 805 ],
806 }],
807 ['OS=="android" and android_build_type==0', {
808 'dependencies': [
809 'ui_java',
810 ],
807 'export_dependent_settings': [ 811 'export_dependent_settings': [
808 'ui_java', 812 'ui_java',
809 ], 813 ],
810 }], 814 }],
811 ['OS=="android" or OS=="ios"', { 815 ['OS=="android" or OS=="ios"', {
812 'sources!': [ 816 'sources!': [
813 'gfx/render_text.cc', 817 'gfx/render_text.cc',
814 'gfx/render_text.h', 818 'gfx/render_text.h',
815 ], 819 ],
816 }], 820 }],
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 ], 864 ],
861 'export_dependent_settings': [ 865 'export_dependent_settings': [
862 '../base/base.gyp:base_java', 866 '../base/base.gyp:base_java',
863 ], 867 ],
864 'includes': [ '../build/java.gypi' ], 868 'includes': [ '../build/java.gypi' ],
865 }, 869 },
866 ], 870 ],
867 }], 871 }],
868 ], 872 ],
869 } 873 }
OLDNEW
« 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