OLD | NEW |
---|---|
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
96 # these fail to compile under xcode for ios | 96 # these fail to compile under xcode for ios |
97 '../src/opts/memset.arm.S', | 97 '../src/opts/memset.arm.S', |
98 '../src/opts/SkBitmapProcState_opts_arm.cpp', | 98 '../src/opts/SkBitmapProcState_opts_arm.cpp', |
99 '../src/opts/SkBlitRow_opts_arm.cpp', | 99 '../src/opts/SkBlitRow_opts_arm.cpp', |
100 ], | 100 ], |
101 }], | 101 }], |
102 ], | 102 ], |
103 }], | 103 }], |
104 [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_versio n < 7) \ | 104 [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_versio n < 7) \ |
105 or (skia_os == "ios") \ | 105 or (skia_os == "ios") \ |
106 or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "m ips", "arm64"])', { | 106 or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "m ips", "arm64"]) \ |
107 or (skia_android_framework and skia_arch_type == "arm64")', { | |
scroggo
2014/05/06 19:07:12
For both changes to this file, would it be possibl
| |
107 'sources': [ | 108 'sources': [ |
108 '../src/opts/SkBitmapProcState_opts_none.cpp', | 109 '../src/opts/SkBitmapProcState_opts_none.cpp', |
109 '../src/opts/SkBlitMask_opts_none.cpp', | 110 '../src/opts/SkBlitMask_opts_none.cpp', |
110 '../src/opts/SkBlitRow_opts_none.cpp', | 111 '../src/opts/SkBlitRow_opts_none.cpp', |
111 '../src/opts/SkBlurImage_opts_none.cpp', | 112 '../src/opts/SkBlurImage_opts_none.cpp', |
112 '../src/opts/SkMorphology_opts_none.cpp', | 113 '../src/opts/SkMorphology_opts_none.cpp', |
113 '../src/opts/SkUtils_opts_none.cpp', | 114 '../src/opts/SkUtils_opts_none.cpp', |
114 '../src/opts/SkXfermode_opts_none.cpp', | 115 '../src/opts/SkXfermode_opts_none.cpp', |
115 ], | 116 ], |
116 }], | 117 }], |
117 [ 'skia_android_framework', { | 118 [ 'skia_android_framework', { |
118 'cflags!': [ | 119 'cflags!': [ |
119 '-msse2', | 120 '-msse2', |
120 '-mfpu=neon', | 121 '-mfpu=neon', |
121 '-fomit-frame-pointer', | 122 '-fomit-frame-pointer', |
122 '-mno-apcs-frame', | 123 '-mno-apcs-frame', |
123 ] | 124 ] |
124 }], | 125 }], |
125 [ 'skia_arch_type == "arm64"', { | 126 [ 'skia_arch_type == "arm64" and skia_android_framework == 0', { |
126 'sources': [ | 127 'sources': [ |
127 '../src/opts/SkBitmapProcState_arm_neon.cpp', | 128 '../src/opts/SkBitmapProcState_arm_neon.cpp', |
128 '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', | 129 '../src/opts/SkBitmapProcState_matrixProcs_neon.cpp', |
129 '../src/opts/SkBitmapProcState_opts_arm.cpp', | 130 '../src/opts/SkBitmapProcState_opts_arm.cpp', |
130 '../src/opts/SkBlitMask_opts_arm.cpp', | 131 '../src/opts/SkBlitMask_opts_arm.cpp', |
131 '../src/opts/SkBlitMask_opts_arm_neon.cpp', | 132 '../src/opts/SkBlitMask_opts_arm_neon.cpp', |
132 '../src/opts/SkBlitRow_opts_none.cpp', | 133 '../src/opts/SkBlitRow_opts_none.cpp', |
133 '../src/opts/SkBlurImage_opts_arm.cpp', | 134 '../src/opts/SkBlurImage_opts_arm.cpp', |
134 '../src/opts/SkBlurImage_opts_neon.cpp', | 135 '../src/opts/SkBlurImage_opts_neon.cpp', |
135 '../src/opts/SkMorphology_opts_arm.cpp', | 136 '../src/opts/SkMorphology_opts_arm.cpp', |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
215 '../src/opts/SkBitmapProcState_matrix_neon.h', | 216 '../src/opts/SkBitmapProcState_matrix_neon.h', |
216 '../src/opts/SkBlitMask_opts_arm_neon.cpp', | 217 '../src/opts/SkBlitMask_opts_arm_neon.cpp', |
217 '../src/opts/SkBlitRow_opts_arm_neon.cpp', | 218 '../src/opts/SkBlitRow_opts_arm_neon.cpp', |
218 '../src/opts/SkBlurImage_opts_neon.cpp', | 219 '../src/opts/SkBlurImage_opts_neon.cpp', |
219 '../src/opts/SkMorphology_opts_neon.cpp', | 220 '../src/opts/SkMorphology_opts_neon.cpp', |
220 '../src/opts/SkXfermode_opts_arm_neon.cpp', | 221 '../src/opts/SkXfermode_opts_arm_neon.cpp', |
221 ], | 222 ], |
222 }, | 223 }, |
223 ], | 224 ], |
224 } | 225 } |
OLD | NEW |