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

Side by Side Diff: ui/ui.gyp

Issue 12730006: Android: rename android_build_type gyp variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add bug # to comments Created 7 years, 9 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 | « ui/shell_dialogs.gypi ('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 'shell_dialogs.gypi', 10 'shell_dialogs.gypi',
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 ], 812 ],
813 'include_dirs': [ 813 'include_dirs': [
814 '<(SHARED_INTERMEDIATE_DIR)/ui', 814 '<(SHARED_INTERMEDIATE_DIR)/ui',
815 ], 815 ],
816 'link_settings': { 816 'link_settings': {
817 'libraries': [ 817 'libraries': [
818 '-ljnigraphics', 818 '-ljnigraphics',
819 ], 819 ],
820 }, 820 },
821 }], 821 }],
822 ['OS=="android" and android_build_type==0', { 822 ['OS=="android" and android_webview_build==0', {
823 'dependencies': [ 823 'dependencies': [
824 'ui_java', 824 'ui_java',
825 ], 825 ],
826 }], 826 }],
827 ['OS=="android" or OS=="ios"', { 827 ['OS=="android" or OS=="ios"', {
828 'sources!': [ 828 'sources!': [
829 'gfx/render_text.cc', 829 'gfx/render_text.cc',
830 'gfx/render_text.h', 830 'gfx/render_text.h',
831 ], 831 ],
832 }], 832 }],
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 'link_settings': { 933 'link_settings': {
934 'libraries': [ 934 'libraries': [
935 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', 935 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
936 ], 936 ],
937 }, 937 },
938 }, 938 },
939 ], 939 ],
940 }], 940 }],
941 ], 941 ],
942 } 942 }
OLDNEW
« no previous file with comments | « ui/shell_dialogs.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698