diff --git a/Makefile b/Makefile index aa144100b..20dc224e3 100644 --- a/Makefile +++ b/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 diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi index 9b42db51a..80e925d9d 100644 --- a/gyp/apptype_console.gypi +++ b/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', ], diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 1976dbee2..3d19e6209 100644 --- a/gyp/common_variables.gypi +++ b/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)', diff --git a/skia.gyp b/skia.gyp index d78435eaf..d41df7f17 100644 --- a/skia.gyp +++ b/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', ],