aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-07-18 14:59:54 +0000
committerGravatar borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-07-18 14:59:54 +0000
commit7ef392940da93e78c24ee75875b83bb416bc75fb (patch)
tree5a98dbd382a77a839de7cd6fc68c77fbb5709e0b /Makefile
parentd074c3709afa6ea70888262a402603197d71dd11 (diff)
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 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