Update Android toolchain to NDK r8d with GCC 4.7
Review URL: https://codereview.appspot.com/7201045
git-svn-id: http://skia.googlecode.com/svn/trunk@7343 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 0e13333..ff4caf8 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -315,14 +315,6 @@
'-fno-exceptions',
'-fno-rtti',
'-fuse-ld=gold',
- '--sysroot=<(android_base)/toolchains/<(android_toolchain)/sysroot',
- ],
- 'include_dirs' : [
- '<(android_base)/toolchains/<(android_toolchain)/lib/gcc/arm-linux-androideabi/4.6.x-google/include',
- '<(android_base)/toolchains/<(android_toolchain)/lib/gcc/arm-linux-androideabi/4.6.x-google/include-fixed',
- '<(android_base)/toolchains/<(android_toolchain)/arm-linux-androideabi/include/c++/4.6',
- '<(android_base)/toolchains/<(android_toolchain)/arm-linux-androideabi/include/c++/4.6/arm-linux-androideabi',
- '<(android_base)/toolchains/<(android_toolchain)/sysroot/usr/include',
],
'conditions': [
[ 'skia_warnings_as_errors == 1', {
@@ -333,11 +325,6 @@
[ 'skia_profile_enabled == 1', {
'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
}],
- [ 'skia_arch_type == "arm"', {
- 'ldflags': [
- '-Wl',
- ],
- }],
[ 'skia_arch_type == "arm" and arm_thumb == 1', {
'cflags': [
'-mthumb',
@@ -362,6 +349,10 @@
'cflags': [
'-mfpu=neon',
],
+ 'ldflags': [
+ '-march=armv7-a',
+ '-Wl,--fix-cortex-a8',
+ ],
}],
[ 'arm_neon_optional == 1', {
'defines': [
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index af54f6e..30f464f 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -158,6 +158,10 @@
'-mfpu=neon',
'-fomit-frame-pointer',
],
+ 'ldflags': [
+ '-march=armv7-a',
+ '-Wl,--fix-cortex-a8',
+ ],
'sources': [
'../src/opts/memset16_neon.S',
'../src/opts/memset32_neon.S',