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

5 files changed, 10 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index a179b6edba..4de8bc6f66 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,10 @@ CWD := $(shell pwd)
 ALL_TARGETS := core SampleApp bench gm tests tools
 
 ifneq (,$(findstring skia_os=android, $(GYP_DEFINES)))
+ifeq (,$(findstring android_make_apk=0, $(GYP_DEFINES)))
   ALL_TARGETS += SkiaAndroidApp
 endif
+endif
 
 # Default target.  This must be listed before all other targets.
 .PHONY: default
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi
index 6971b6a59e..62f1b9fc07 100644
--- a/gyp/apptype_console.gypi
+++ b/gyp/apptype_console.gypi
@@ -12,7 +12,7 @@
       },
     },
     'conditions': [
-      [ 'skia_os == "android"', {
+      [ 'skia_os == "android" and android_make_apk == 1', {
         'dependencies': [
           'android_system.gyp:Android_EntryPoint',
         ],
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index ee00a342c5..88e710ef61 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -66,6 +66,7 @@
       'skia_angle%': 0,
       'skia_arch_type%': 'x86',
       'skia_arch_width%': 32,
+      'android_make_apk%': 1,
     },
 
     # Re-define all variables defined within the level-2 'variables' dict,
@@ -78,6 +79,7 @@
     'skia_angle%': '<(skia_angle)',
     'skia_arch_type%': '<(skia_arch_type)',
     'skia_arch_width%': '<(skia_arch_width)',
+    'android_make_apk%': '<(android_make_apk)',
   },
 }
 # Local Variables:
diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index cb15a2ac2e..a551ceb8c3 100644
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -4,10 +4,7 @@
       'target_name': 'effects',
       'type': 'static_library',
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../include/effects',
-        '../include/gpu',
         '../src/gpu',
       ],
       'sources': [
@@ -87,6 +84,10 @@
           '../include/effects',
         ],
       },
+      'dependencies': [
+        'core.gyp:core',
+        'gpu.gyp:gr',
+      ],
     },
   ],
 }
diff --git a/skia.gyp b/skia.gyp
index aa968ff65c..8671eace4d 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',
           ],