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

Side by Side Diff: gyp/opts.gyp

Issue 694533002: Cleanup android to ensure it can compile with clang (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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 | include/views/SkOSWindow_Android.h » ('j') | include/views/SkOSWindow_Android.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Gyp file for opts projects 1 # Gyp file for opts projects
2 { 2 {
3 'targets': [ 3 'targets': [
4 # Due to an unfortunate intersection of lameness between gcc and gyp, 4 # Due to an unfortunate intersection of lameness between gcc and gyp,
5 # we have to build the *_SSE2.cpp files in a separate target. The 5 # we have to build the *_SSE2.cpp files in a separate target. The
6 # gcc lameness is that, in order to compile SSE2 intrinsics code, it 6 # gcc lameness is that, in order to compile SSE2 intrinsics code, it
7 # must be passed the -msse2 flag. However, with this flag, it may 7 # must be passed the -msse2 flag. However, with this flag, it may
8 # emit SSE2 instructions even for scalar code, such as the CPUID 8 # emit SSE2 instructions even for scalar code, such as the CPUID
9 # test used to test for the presence of SSE2. So that, and all other 9 # test used to test for the presence of SSE2. So that, and all other
10 # code must be compiled *without* -msse2. The gyp lameness is that it 10 # code must be compiled *without* -msse2. The gyp lameness is that it
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 [ 'skia_arch_type == "arm" and arm_version >= 7', { 65 [ 'skia_arch_type == "arm" and arm_version >= 7', {
66 # The assembly uses the frame pointer register (r7 in Thumb/r11 in 66 # The assembly uses the frame pointer register (r7 in Thumb/r11 in
67 # ARM), the compiler doesn't like that. 67 # ARM), the compiler doesn't like that.
68 'cflags!': [ 68 'cflags!': [
69 '-fno-omit-frame-pointer', 69 '-fno-omit-frame-pointer',
70 '-mapcs-frame', 70 '-mapcs-frame',
71 '-mapcs', 71 '-mapcs',
72 ], 72 ],
73 'cflags': [ 73 'cflags': [
74 '-fomit-frame-pointer', 74 '-fomit-frame-pointer',
75 '-mno-apcs-frame',
djsollen 2014/10/30 14:58:06 this is the default on gcc and is not supported on
76 ], 75 ],
77 'variables': { 76 'variables': {
78 'arm_neon_optional%': '<(arm_neon_optional>', 77 'arm_neon_optional%': '<(arm_neon_optional>',
79 }, 78 },
80 'sources': [ 79 'sources': [
81 '../src/opts/memset.arm.S', 80 '../src/opts/memset.arm.S',
82 '../src/opts/SkBitmapProcState_opts_arm.cpp', 81 '../src/opts/SkBitmapProcState_opts_arm.cpp',
83 '../src/opts/SkBlitMask_opts_arm.cpp', 82 '../src/opts/SkBlitMask_opts_arm.cpp',
84 '../src/opts/SkBlitRow_opts_arm.cpp', 83 '../src/opts/SkBlitRow_opts_arm.cpp',
85 '../src/opts/SkBlurImage_opts_arm.cpp', 84 '../src/opts/SkBlurImage_opts_arm.cpp',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 '../src/opts/SkUtils_opts_none.cpp', 139 '../src/opts/SkUtils_opts_none.cpp',
141 '../src/opts/SkTextureCompression_opts_none.cpp', 140 '../src/opts/SkTextureCompression_opts_none.cpp',
142 '../src/opts/SkXfermode_opts_none.cpp', 141 '../src/opts/SkXfermode_opts_none.cpp',
143 ], 142 ],
144 }], 143 }],
145 [ 'skia_android_framework', { 144 [ 'skia_android_framework', {
146 'cflags!': [ 145 'cflags!': [
147 '-msse2', 146 '-msse2',
148 '-mfpu=neon', 147 '-mfpu=neon',
149 '-fomit-frame-pointer', 148 '-fomit-frame-pointer',
150 '-mno-apcs-frame',
151 ] 149 ]
152 }], 150 }],
153 [ 'skia_arch_type == "arm64"', { 151 [ 'skia_arch_type == "arm64"', {
154 'sources': [ 152 'sources': [
155 '../src/opts/SkBitmapProcState_arm_neon.cpp', 153 '../src/opts/SkBitmapProcState_arm_neon.cpp',
156 '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', 154 '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
157 '../src/opts/SkBitmapProcState_opts_arm.cpp', 155 '../src/opts/SkBitmapProcState_opts_arm.cpp',
158 '../src/opts/SkBlitMask_opts_arm.cpp', 156 '../src/opts/SkBlitMask_opts_arm.cpp',
159 '../src/opts/SkBlitMask_opts_arm_neon.cpp', 157 '../src/opts/SkBlitMask_opts_arm_neon.cpp',
160 '../src/opts/SkBlitRow_opts_arm.cpp', 158 '../src/opts/SkBlitRow_opts_arm.cpp',
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 '../src/opts/SkBlitMask_opts_arm_neon.cpp', 299 '../src/opts/SkBlitMask_opts_arm_neon.cpp',
302 '../src/opts/SkBlitRow_opts_arm_neon.cpp', 300 '../src/opts/SkBlitRow_opts_arm_neon.cpp',
303 '../src/opts/SkBlurImage_opts_neon.cpp', 301 '../src/opts/SkBlurImage_opts_neon.cpp',
304 '../src/opts/SkMorphology_opts_neon.cpp', 302 '../src/opts/SkMorphology_opts_neon.cpp',
305 '../src/opts/SkTextureCompression_opts_neon.cpp', 303 '../src/opts/SkTextureCompression_opts_neon.cpp',
306 '../src/opts/SkXfermode_opts_arm_neon.cpp', 304 '../src/opts/SkXfermode_opts_arm_neon.cpp',
307 ], 305 ],
308 }, 306 },
309 ], 307 ],
310 } 308 }
OLDNEW
« no previous file with comments | « no previous file | include/views/SkOSWindow_Android.h » ('j') | include/views/SkOSWindow_Android.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698