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

Side by Side Diff: base/base.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 | « no previous file | net/net.gyp » ('j') | 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 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 }], 115 }],
116 ['OS == "android" and _toolset == "target"', { 116 ['OS == "android" and _toolset == "target"', {
117 'conditions': [ 117 'conditions': [
118 ['target_arch == "ia32"', { 118 ['target_arch == "ia32"', {
119 'sources/': [ 119 'sources/': [
120 ['include', '^atomicops_internals_x86_gcc\\.cc$'], 120 ['include', '^atomicops_internals_x86_gcc\\.cc$'],
121 ], 121 ],
122 }], 122 }],
123 ], 123 ],
124 'dependencies': [ 124 'dependencies': [
125 'base_java',
126 'base_jni_headers', 125 'base_jni_headers',
127 'symbolize', 126 'symbolize',
128 '../third_party/ashmem/ashmem.gyp:ashmem', 127 '../third_party/ashmem/ashmem.gyp:ashmem',
129 '../third_party/icu/icu.gyp:icuuc', 128 '../third_party/icu/icu.gyp:icuuc',
130 ], 129 ],
131 'include_dirs': [ 130 'include_dirs': [
132 '<(SHARED_INTERMEDIATE_DIR)/base', 131 '<(SHARED_INTERMEDIATE_DIR)/base',
133 ], 132 ],
134 'link_settings': { 133 'link_settings': {
135 'libraries': [ 134 'libraries': [
136 '-llog', 135 '-llog',
137 ], 136 ],
138 }, 137 },
139 'defines': [ 138 'defines': [
140 'USE_SYMBOLIZE', 139 'USE_SYMBOLIZE',
141 ], 140 ],
142 'sources!': [ 141 'sources!': [
143 'debug/stack_trace_posix.cc', 142 'debug/stack_trace_posix.cc',
144 ], 143 ],
144 }],
145 ['OS == "android" and _toolset == "target" and android_build_type == 0', {
146 'dependencies': [
147 'base_java',
148 ],
145 'export_dependent_settings': [ 149 'export_dependent_settings': [
146 'base_java', 150 'base_java',
147 ], 151 ],
148 }], 152 }],
149 ['os_bsd==1', { 153 ['os_bsd==1', {
150 'include_dirs': [ 154 'include_dirs': [
151 '/usr/local/include', 155 '/usr/local/include',
152 ], 156 ],
153 'link_settings': { 157 'link_settings': {
154 'libraries': [ 158 'libraries': [
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 '--result', '<@(_outputs)', 1058 '--result', '<@(_outputs)',
1055 '--isolate', 'base_unittests.isolate', 1059 '--isolate', 'base_unittests.isolate',
1056 ], 1060 ],
1057 }, 1061 },
1058 ], 1062 ],
1059 }, 1063 },
1060 ], 1064 ],
1061 }], 1065 }],
1062 ], 1066 ],
1063 } 1067 }
OLDNEW
« no previous file with comments | « no previous file | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698