commit 7ef392940da93e78c24ee75875b83bb416bc75fb
author borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 18 14:59:54 2012 +0000
committer borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 18 14:59:54 2012 +0000
tree 5a98dbd382a77a839de7cd6fc68c77fbb5709e0b
parent d074c3709afa6ea70888262a402603197d71dd11

Enable Compile Option to Build Android Executables

Since we can't debug APKs on 4.1, we sometimes need to
build Skia the old way for Android.  This CL enables
a switch to do so.
Review URL: https://codereview.appspot.com/6408053

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

skia.gyp

diff --git a/skia.gyp b/skia.gyp
index aa968ff..8671eac 100644
--- a/skia.gyp
+++ b/skia.gyp
@@ -23,7 +23,7 @@
         'gyp/debugger.gyp:debugger',
       ],
       'conditions': [
-        ['skia_os == "android"', {
+        ['skia_os == "android" and android_make_apk == 1', {
           'dependencies': [
             'gyp/android_system.gyp:SkiaAndroidApp',
           ],