Remove support for building skia android apps outside of an APK.

Review URL: https://codereview.appspot.com/6663043

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

Makefile

@@ -37,10 +37,8 @@ ALL_TARGETS := skia_base_libs \
                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

gyp/apptype_console.gypi

@@ -12,7 +12,7 @@
       },
     },
     'conditions': [
-      [ 'skia_os == "android" and android_make_apk == 1', {
+      [ 'skia_os == "android"', {
         'dependencies': [
           'android_deps.gyp:Android_EntryPoint',
         ],

gyp/common_variables.gypi

@@ -83,7 +83,6 @@
       'skia_nv_path_rendering%': 0,
       'skia_angle%': 0,
       'skia_directwrite%': 0,
-      'android_make_apk%': 1,
       'skia_nacl%': 0,
       'skia_gpu%': 1,
       'skia_osx_sdkroot%': 'macosx',
@@ -102,7 +101,6 @@
     'skia_arch_width%': '<(skia_arch_width)',
     'skia_arch_type%': '<(skia_arch_type)',
     'skia_directwrite%': '<(skia_directwrite)',
-    'android_make_apk%': '<(android_make_apk)',
     'skia_nacl%': '<(skia_nacl)',
     'skia_gpu%': '<(skia_gpu)',
     'skia_osx_sdkroot%': '<(skia_osx_sdkroot)',

skia.gyp

@@ -25,7 +25,7 @@
         'gyp/tools.gyp:tools',
       ],
       'conditions': [
-        ['skia_os == "android" and android_make_apk == 1', {
+        ['skia_os == "android"', {
           'dependencies': [
             'gyp/android_system.gyp:SkiaAndroidApp',
           ],