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

Side by Side Diff: skia/skia.gyp

Issue 11316228: Make profiling=1 work for chromium-android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Updated per digit's request Created 8 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
« no previous file with comments | « build/common.gypi ('k') | 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) 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'skia', 8 'target_name': 'skia',
9 'type': '<(component)', 9 'type': '<(component)',
10 'variables': { 10 'variables': {
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 '-Wa,-mimplicit-it=always', 697 '-Wa,-mimplicit-it=always',
698 ], 698 ],
699 }], 699 }],
700 ], 700 ],
701 # The assembly uses the frame pointer register (r7 in Thumb/r11 in 701 # The assembly uses the frame pointer register (r7 in Thumb/r11 in
702 # ARM), the compiler doesn't like that. Explicitly remove the 702 # ARM), the compiler doesn't like that. Explicitly remove the
703 # -fno-omit-frame-pointer flag for Android, as that gets added to all 703 # -fno-omit-frame-pointer flag for Android, as that gets added to all
704 # targets via common.gypi. 704 # targets via common.gypi.
705 'cflags!': [ 705 'cflags!': [
706 '-fno-omit-frame-pointer', 706 '-fno-omit-frame-pointer',
707 '-marm',
708 '-mapcs-frame',
707 ], 709 ],
708 'cflags': [ 710 'cflags': [
709 '-fomit-frame-pointer', 711 '-fomit-frame-pointer',
710 ], 712 ],
711 'sources': [ 713 'sources': [
712 '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp', 714 '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
713 ], 715 ],
714 }], 716 }],
715 [ 'armv7 == 1 and arm_neon == 0', { 717 [ 'armv7 == 1 and arm_neon == 0', {
716 'sources': [ 718 'sources': [
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 'sources': [ 839 'sources': [
838 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', 840 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
839 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', 841 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
840 '../third_party/skia/src/opts/SkUtils_opts_none.cpp', 842 '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
841 ], 843 ],
842 }, 844 },
843 ], 845 ],
844 }], 846 }],
845 ], 847 ],
846 } 848 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698