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

Side by Side Diff: build/android.gypi

Issue 98543008: Switch armv7 setting to arm_version=7 in v8 gyp files (Closed) Base URL: git://github.com/v8/v8.git@master
Patch Set: Created 7 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 | « no previous file | build/standalone.gypi » ('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 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 '-Wl,-rpath-link=<(android_lib)', 139 '-Wl,-rpath-link=<(android_lib)',
140 '-L<(android_lib)', 140 '-L<(android_lib)',
141 ], 141 ],
142 }], 142 }],
143 ['target_arch == "arm"', { 143 ['target_arch == "arm"', {
144 'ldflags': [ 144 'ldflags': [
145 # Enable identical code folding to reduce size. 145 # Enable identical code folding to reduce size.
146 '-Wl,--icf=safe', 146 '-Wl,--icf=safe',
147 ], 147 ],
148 }], 148 }],
149 ['target_arch=="arm" and armv7==1', { 149 ['target_arch=="arm" and arm_version==7', {
150 'cflags': [ 150 'cflags': [
151 '-march=armv7-a', 151 '-march=armv7-a',
152 '-mtune=cortex-a8', 152 '-mtune=cortex-a8',
153 '-mfpu=vfp3', 153 '-mfpu=vfp3',
154 ], 154 ],
155 }], 155 }],
156 # NOTE: The stlport header include paths below are specified in 156 # NOTE: The stlport header include paths below are specified in
157 # cflags rather than include_dirs because they need to come 157 # cflags rather than include_dirs because they need to come
158 # after include_dirs. Think of them like system headers, but 158 # after include_dirs. Think of them like system headers, but
159 # don't use '-isystem' because the arm-linux-androideabi-4.4.3 159 # don't use '-isystem' because the arm-linux-androideabi-4.4.3
160 # toolchain (circa Gingerbread) will exhibit strange errors. 160 # toolchain (circa Gingerbread) will exhibit strange errors.
161 # The include ordering here is important; change with caution. 161 # The include ordering here is important; change with caution.
162 ['use_system_stlport==0', { 162 ['use_system_stlport==0', {
163 'cflags': [ 163 'cflags': [
164 '-I<(android_stlport_include)', 164 '-I<(android_stlport_include)',
165 ], 165 ],
166 'conditions': [ 166 'conditions': [
167 ['target_arch=="arm" and armv7==1', { 167 ['target_arch=="arm" and arm_version==7', {
168 'ldflags': [ 168 'ldflags': [
169 '-L<(android_stlport_libs)/armeabi-v7a', 169 '-L<(android_stlport_libs)/armeabi-v7a',
170 ], 170 ],
171 }], 171 }],
172 ['target_arch=="arm" and armv7==0', { 172 ['target_arch=="arm" and arm_version==7', {
Fredrik Öhrn 2013/12/11 09:19:12 Should be arm_version < 7.
Mostyn Bramley-Moore 2013/12/11 09:46:02 Done.
173 'ldflags': [ 173 'ldflags': [
174 '-L<(android_stlport_libs)/armeabi', 174 '-L<(android_stlport_libs)/armeabi',
175 ], 175 ],
176 }], 176 }],
177 ['target_arch=="mipsel"', { 177 ['target_arch=="mipsel"', {
178 'ldflags': [ 178 'ldflags': [
179 '-L<(android_stlport_libs)/mips', 179 '-L<(android_stlport_libs)/mips',
180 ], 180 ],
181 }], 181 }],
182 ['target_arch=="ia32"', { 182 ['target_arch=="ia32"', {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 'ldflags!': [ 243 'ldflags!': [
244 '-Wl,-z,noexecstack', 244 '-Wl,-z,noexecstack',
245 '-Wl,--gc-sections', 245 '-Wl,--gc-sections',
246 '-Wl,-O1', 246 '-Wl,-O1',
247 '-Wl,--as-needed', 247 '-Wl,--as-needed',
248 ], 248 ],
249 }], 249 }],
250 ], # target_conditions 250 ], # target_conditions
251 }, # target_defaults 251 }, # target_defaults
252 } 252 }
OLDNEW
« no previous file with comments | « no previous file | build/standalone.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698