| Index: build/android.gypi
|
| diff --git a/build/android.gypi b/build/android.gypi
|
| index ca097255bbb5ce4deb018d5d95743af22af67b7c..0ea899d6edd9d1896e3e0e17632ae0712cf97395 100644
|
| --- a/build/android.gypi
|
| +++ b/build/android.gypi
|
| @@ -146,7 +146,7 @@
|
| '-Wl,--icf=safe',
|
| ],
|
| }],
|
| - ['target_arch=="arm" and armv7==1', {
|
| + ['target_arch=="arm" and arm_version==7', {
|
| 'cflags': [
|
| '-march=armv7-a',
|
| '-mtune=cortex-a8',
|
| @@ -164,12 +164,12 @@
|
| '-I<(android_stlport_include)',
|
| ],
|
| 'conditions': [
|
| - ['target_arch=="arm" and armv7==1', {
|
| + ['target_arch=="arm" and arm_version==7', {
|
| 'ldflags': [
|
| '-L<(android_stlport_libs)/armeabi-v7a',
|
| ],
|
| }],
|
| - ['target_arch=="arm" and armv7==0', {
|
| + ['target_arch=="arm" and arm_version < 7', {
|
| 'ldflags': [
|
| '-L<(android_stlport_libs)/armeabi',
|
| ],
|
|
|