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

Side by Side Diff: build/common.gypi

Issue 18034029: [Android] Fix compilation with order_profiling=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | tools/android/md5sum/md5sum.gyp » ('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 # 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 3307 matching lines...) Expand 10 before | Expand all | Expand 10 after
3318 ], 3318 ],
3319 }], 3319 }],
3320 ], 3320 ],
3321 }], 3321 }],
3322 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', { 3322 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android") ', {
3323 'target_conditions' : [ 3323 'target_conditions' : [
3324 ['_toolset=="target"', { 3324 ['_toolset=="target"', {
3325 'cflags': [ 3325 'cflags': [
3326 '-finstrument-functions', 3326 '-finstrument-functions',
3327 # Allow mmx intrinsics to inline, so that the 3327 # Allow mmx intrinsics to inline, so that the
3328 # compiler can expand the intrinsics. 3328 #0 compiler can expand the intrinsics.
3329 '-finstrument-functions-exclude-file-list=mmintrin.h', 3329 '-finstrument-functions-exclude-file-list=mmintrin.h',
3330 ], 3330 ],
3331 }], 3331 }],
3332 ['_toolset=="target" and OS=="android"', {
3333 'cflags': [
3334 # Avoids errors with current NDK:
3335 # "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"
3336 '-finstrument-functions-exclude-file-list=arm_neon.h',
3337 ],
3338 }],
3332 ], 3339 ],
3333 }], 3340 }],
3334 ['linux_breakpad==1', { 3341 ['linux_breakpad==1', {
3335 'defines': ['USE_LINUX_BREAKPAD'], 3342 'defines': ['USE_LINUX_BREAKPAD'],
3336 }], 3343 }],
3337 ['linux_dump_symbols==1', { 3344 ['linux_dump_symbols==1', {
3338 'cflags': [ '-g' ], 3345 'cflags': [ '-g' ],
3339 'conditions': [ 3346 'conditions': [
3340 ['target_arch=="ia32" and OS!="android"', { 3347 ['target_arch=="ia32" and OS!="android"', {
3341 'target_conditions': [ 3348 'target_conditions': [
(...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
4632 # settings in target dicts. SYMROOT is a special case, because many other 4639 # settings in target dicts. SYMROOT is a special case, because many other
4633 # Xcode variables depend on it, including variables such as 4640 # Xcode variables depend on it, including variables such as
4634 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4641 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4635 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4642 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4636 # files to appear (when present) in the UI as actual files and not red 4643 # files to appear (when present) in the UI as actual files and not red
4637 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4644 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4638 # and therefore SYMROOT, needs to be set at the project level. 4645 # and therefore SYMROOT, needs to be set at the project level.
4639 'SYMROOT': '<(DEPTH)/xcodebuild', 4646 'SYMROOT': '<(DEPTH)/xcodebuild',
4640 }, 4647 },
4641 } 4648 }
OLDNEW
« no previous file with comments | « no previous file | tools/android/md5sum/md5sum.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698