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

Side by Side Diff: build/common.gypi

Issue 1325053009: cygprofile: increase timeouts to allow showing web contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 4614 matching lines...) Expand 10 before | Expand all | Expand 10 after
4625 ], 4625 ],
4626 }], 4626 }],
4627 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', { 4627 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', {
4628 'target_conditions' : [ 4628 'target_conditions' : [
4629 # crazy_linker has an upstream gyp file we can't edit, and we 4629 # crazy_linker has an upstream gyp file we can't edit, and we
4630 # don't want to instrument it. 4630 # don't want to instrument it.
4631 ['_toolset=="target" and _target_name!="crazy_linker"', { 4631 ['_toolset=="target" and _target_name!="crazy_linker"', {
4632 'cflags': [ 4632 'cflags': [
4633 '-finstrument-functions', 4633 '-finstrument-functions',
4634 # Allow mmx intrinsics to inline, so that the 4634 # Allow mmx intrinsics to inline, so that the
4635 #0 compiler can expand the intrinsics. 4635 # compiler can expand the intrinsics.
4636 '-finstrument-functions-exclude-file-list=mmintrin.h', 4636 '-finstrument-functions-exclude-file-list=mmintrin.h',
4637 ], 4637 ],
4638 'defines': ['CYGPROFILE_INSTRUMENTATION'],
4638 }], 4639 }],
4639 ['_toolset=="target" and OS=="android"', { 4640 ['_toolset=="target" and OS=="android"', {
4640 'cflags': [ 4641 'cflags': [
4641 # Avoids errors with current NDK: 4642 # Avoids errors with current NDK:
4642 # "third_party/android_tools/ndk/toolchains/arm-linux-androide abi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/a rm_neon.h:3426:3: error: argument must be a constant" 4643 # "third_party/android_tools/ndk/toolchains/arm-linux-androide abi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/a rm_neon.h:3426:3: error: argument must be a constant"
4643 '-finstrument-functions-exclude-file-list=arm_neon.h,Saturated ArithmeticARM.h', 4644 '-finstrument-functions-exclude-file-list=arm_neon.h,Saturated ArithmeticARM.h',
4644 ], 4645 ],
4645 }], 4646 }],
4646 ], 4647 ],
4647 }], 4648 }],
(...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after
6333 # settings in target dicts. SYMROOT is a special case, because many other 6334 # settings in target dicts. SYMROOT is a special case, because many other
6334 # Xcode variables depend on it, including variables such as 6335 # Xcode variables depend on it, including variables such as
6335 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6336 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6336 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6337 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6337 # files to appear (when present) in the UI as actual files and not red 6338 # files to appear (when present) in the UI as actual files and not red
6338 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6339 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6339 # and therefore SYMROOT, needs to be set at the project level. 6340 # and therefore SYMROOT, needs to be set at the project level.
6340 'SYMROOT': '<(DEPTH)/xcodebuild', 6341 'SYMROOT': '<(DEPTH)/xcodebuild',
6341 }, 6342 },
6342 } 6343 }
OLDNEW
« no previous file with comments | « base/android/library_loader/library_prefetcher.cc ('k') | content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698