AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Android build for new toolchain

Browse Source 
The new toolchain (r8b) does not automatically include
the necessary directories
(http://code.google.com/p/android/issues/detail?id=35279).
Add them manually until this is fixed.
Review URL: https://codereview.appspot.com/6419076

git-svn-id: http://skia.googlecode.com/svn/trunk@4749 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
borenet@google.com 2012-07-25 15:17:03 +00:00
parent bba65d9a5e
commit de9ac1446c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gyp/common_conditions.gypi
View File

@ -211,12 +211,20 @@
'cflags': [
'-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_arch_type == "arm"', {
'ldflags': [
'-Wl',
'--fix-cortex-a8',
],
}],
[ 'skia_arch_type == "arm" and arm_thumb == 1', {