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

Side by Side Diff: base/base.gyp

Issue 8822003: Fix android build (base_unittests): exclude jni_android_unittest.cc for now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 }, 270 },
271 'conditions': [ 271 'conditions': [
272 ['OS == "android"', { 272 ['OS == "android"', {
273 'sources!': [ 273 'sources!': [
274 # TODO(michaelbai): Removed the below once the fix upstreamed. 274 # TODO(michaelbai): Removed the below once the fix upstreamed.
275 'memory/mru_cache_unittest.cc', 275 'memory/mru_cache_unittest.cc',
276 'process_util_unittest.cc', 276 'process_util_unittest.cc',
277 'synchronization/cancellation_flag_unittest.cc', 277 'synchronization/cancellation_flag_unittest.cc',
278 # TODO(michaelbai): The below files are excluded because of the 278 # TODO(michaelbai): The below files are excluded because of the
279 # missing JNI and should be added back once JNI is ready. 279 # missing JNI and should be added back once JNI is ready.
280 'android/jni_android_unittest.cc',
280 'android/scoped_java_ref_unittest.cc', 281 'android/scoped_java_ref_unittest.cc',
281 'debug/stack_trace_unittest.cc', 282 'debug/stack_trace_unittest.cc',
282 ], 283 ],
283 }], 284 }],
284 ['use_glib==1', { 285 ['use_glib==1', {
285 'sources!': [ 286 'sources!': [
286 'file_version_info_unittest.cc', 287 'file_version_info_unittest.cc',
287 ], 288 ],
288 'conditions': [ 289 'conditions': [
289 [ 'linux_use_tcmalloc==1', { 290 [ 'linux_use_tcmalloc==1', {
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 'msvs_settings': { 461 'msvs_settings': {
461 'VCLinkerTool': { 462 'VCLinkerTool': {
462 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 463 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
463 }, 464 },
464 }, 465 },
465 }, 466 },
466 ], 467 ],
467 }], 468 }],
468 ], 469 ],
469 } 470 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698