commit 58629291bc145edca8fb303e465c8537bed65314
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 03 13:08:29 2011 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 03 13:08:29 2011 +0000
tree 410475666d60f96be79478d3a553bcbf12aff743
parent d0601d2e7dd478d9cca46595afc00782cd97b82b

Adding support to trunk for building Skia using the Android NDK.

This CL depends on a subsequent CL to add the appropriate NDK
toolchain and system sources to the skia repo.

Review URL: http://codereview.appspot.com/5306089/
Review URL: http://codereview.appspot.com/5306089

git-svn-id: http://skia.googlecode.com/svn/trunk@2592 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/bench.gypi

diff --git a/gyp/bench.gypi b/gyp/bench.gypi
index e993790..6ac64d1 100644
--- a/gyp/bench.gypi
+++ b/gyp/bench.gypi
@@ -40,12 +40,13 @@
         '../bench/BenchSysTimer_mach.cpp',
       ],
     }],
-    [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris"]', {
+    [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
       'sources!': [
         '../bench/BenchSysTimer_posix.h',
         '../bench/BenchSysTimer_posix.cpp',
       ],
-    },{
+    }],
+    [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
       'link_settings': {
         'libraries': [
           '-lrt',