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

Side by Side Diff: base/base.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 | « android_webview/android_webview.gyp ('k') | build/android/cpufeatures.gypi » ('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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 'defines': [ 144 'defines': [
145 'USE_SYMBOLIZE', 145 'USE_SYMBOLIZE',
146 ], 146 ],
147 'sources!': [ 147 'sources!': [
148 'debug/stack_trace_posix.cc', 148 'debug/stack_trace_posix.cc',
149 ], 149 ],
150 'includes': [ 150 'includes': [
151 '../build/android/cpufeatures.gypi', 151 '../build/android/cpufeatures.gypi',
152 ], 152 ],
153 }], 153 }],
154 ['OS == "android" and _toolset == "target" and android_build_type == 0', { 154 ['OS == "android" and _toolset == "target" and android_webview_build == 0', {
155 'dependencies': [ 155 'dependencies': [
156 'base_java', 156 'base_java',
157 ], 157 ],
158 }], 158 }],
159 ['os_bsd==1', { 159 ['os_bsd==1', {
160 'include_dirs': [ 160 'include_dirs': [
161 '/usr/local/include', 161 '/usr/local/include',
162 ], 162 ],
163 'link_settings': { 163 'link_settings': {
164 'libraries': [ 164 'libraries': [
(...skipping 959 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 'includes': [ '../build/jni_generator.gypi' ], 1124 'includes': [ '../build/jni_generator.gypi' ],
1125 }, 1125 },
1126 { 1126 {
1127 'target_name': 'base_java', 1127 'target_name': 'base_java',
1128 'type': 'none', 1128 'type': 'none',
1129 'variables': { 1129 'variables': {
1130 'java_in_dir': '../base/android/java', 1130 'java_in_dir': '../base/android/java',
1131 }, 1131 },
1132 'includes': [ '../build/java.gypi' ], 1132 'includes': [ '../build/java.gypi' ],
1133 'conditions': [ 1133 'conditions': [
1134 ['android_build_type==0', { 1134 ['android_webview_build==0', {
1135 'dependencies': [ 1135 'dependencies': [
1136 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib', 1136 '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
1137 ], 1137 ],
1138 }] 1138 }]
1139 ], 1139 ],
1140 }, 1140 },
1141 { 1141 {
1142 'target_name': 'base_java_test_support', 1142 'target_name': 'base_java_test_support',
1143 'type': 'none', 1143 'type': 'none',
1144 'dependencies': [ 1144 'dependencies': [
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
1215 'base_unittests.isolate', 1215 'base_unittests.isolate',
1216 ], 1216 ],
1217 'sources': [ 1217 'sources': [
1218 'base_unittests.isolate', 1218 'base_unittests.isolate',
1219 ], 1219 ],
1220 }, 1220 },
1221 ], 1221 ],
1222 }], 1222 }],
1223 ], 1223 ],
1224 } 1224 }
OLDNEW
« no previous file with comments | « android_webview/android_webview.gyp ('k') | build/android/cpufeatures.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698