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

Side by Side Diff: base/base.gyp

Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 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 | build/apk_test.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 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 'symbolize', 127 'symbolize',
126 '../third_party/ashmem/ashmem.gyp:ashmem', 128 '../third_party/ashmem/ashmem.gyp:ashmem',
127 '../third_party/icu/icu.gyp:icuuc', 129 '../third_party/icu/icu.gyp:icuuc',
128 'base_jni_headers',
129 ], 130 ],
130 'include_dirs': [ 131 'include_dirs': [
131 '<(SHARED_INTERMEDIATE_DIR)/base', 132 '<(SHARED_INTERMEDIATE_DIR)/base',
132 ], 133 ],
133 'link_settings': { 134 'link_settings': {
134 'libraries': [ 135 'libraries': [
135 '-llog', 136 '-llog',
136 ], 137 ],
137 }, 138 },
138 'defines': [ 139 'defines': [
139 'USE_SYMBOLIZE', 140 'USE_SYMBOLIZE',
140 ], 141 ],
141 'sources!': [ 142 'sources!': [
142 'debug/stack_trace_posix.cc', 143 'debug/stack_trace_posix.cc',
143 ], 144 ],
145 'export_dependent_settings': [
146 'base_java',
147 ],
144 }], 148 }],
145 ['os_bsd==1', { 149 ['os_bsd==1', {
146 'include_dirs': [ 150 'include_dirs': [
147 '/usr/local/include', 151 '/usr/local/include',
148 ], 152 ],
149 'link_settings': { 153 'link_settings': {
150 'libraries': [ 154 'libraries': [
151 '-L/usr/local/lib -lexecinfo', 155 '-L/usr/local/lib -lexecinfo',
152 ], 156 ],
153 }, 157 },
(...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 '--result', '<@(_outputs)', 1037 '--result', '<@(_outputs)',
1034 '--isolate', 'base_unittests.isolate', 1038 '--isolate', 'base_unittests.isolate',
1035 ], 1039 ],
1036 }, 1040 },
1037 ], 1041 ],
1038 }, 1042 },
1039 ], 1043 ],
1040 }], 1044 }],
1041 ], 1045 ],
1042 } 1046 }
OLDNEW
« no previous file with comments | « no previous file | build/apk_test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698