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

Side by Side Diff: base/base.gyp

Issue 10697079: Upstreaming Cygprofile for Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
« no previous file with comments | « no previous file | build/common.gypi » ('j') | tools/cygprofile/LICENSE » ('J')
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 17 matching lines...) Expand all
28 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 28 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
29 ], 29 ],
30 # TODO(gregoryd): direct_dependent_settings should be shared with the 30 # TODO(gregoryd): direct_dependent_settings should be shared with the
31 # 64-bit target, but it doesn't work due to a bug in gyp 31 # 64-bit target, but it doesn't work due to a bug in gyp
32 'direct_dependent_settings': { 32 'direct_dependent_settings': {
33 'include_dirs': [ 33 'include_dirs': [
34 '..', 34 '..',
35 ], 35 ],
36 }, 36 },
37 'conditions': [ 37 'conditions': [
38 [ 'order_profiling !=0 and OS == "android" and _toolset == "target"', {
39 'dependencies': [
40 '../tools/cygprofile/cygprofile.gyp:cygprofile'
41 ],
42 }], # order_profiling !=0 and OS == "android" and _toolset == "target"
38 ['use_glib==1', { 43 ['use_glib==1', {
39 'conditions': [ 44 'conditions': [
40 ['chromeos==1', { 45 ['chromeos==1', {
41 'sources/': [ ['include', '_chromeos\\.cc$'] ] 46 'sources/': [ ['include', '_chromeos\\.cc$'] ]
42 }], 47 }],
43 ['linux_use_tcmalloc==0', { 48 ['linux_use_tcmalloc==0', {
44 'defines': [ 49 'defines': [
45 'NO_TCMALLOC', 50 'NO_TCMALLOC',
46 ], 51 ],
47 'direct_dependent_settings': { 52 'direct_dependent_settings': {
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 'test_suite_name': 'base_unittests', 1026 'test_suite_name': 'base_unittests',
1022 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unit tests<(SHARED_LIB_SUFFIX)', 1027 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unit tests<(SHARED_LIB_SUFFIX)',
1023 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',], 1028 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
1024 }, 1029 },
1025 'includes': [ '../build/apk_test.gypi' ], 1030 'includes': [ '../build/apk_test.gypi' ],
1026 }, 1031 },
1027 ], 1032 ],
1028 }], 1033 }],
1029 ], 1034 ],
1030 } 1035 }
OLDNEW
« no previous file with comments | « no previous file | build/common.gypi » ('j') | tools/cygprofile/LICENSE » ('J')

Powered by Google App Engine
This is Rietveld 408576698