Updates to Android.mk generation.

Android.mk

Index: Android.mk
diff --git a/Android.mk b/Android.mk
index 2eb271f00c8685318daa3f930108bbf9295e5f09..5588764d62f6481b8891bb3acf679ab601a036ac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,27 +49,14 @@ ifeq ($(NO_FALLBACK_FONT),true)
 	LOCAL_CFLAGS += -DNO_FALLBACK_FONT
 endif
 
+ifeq ($(TARGET_ARCH),arm64)
+    $(warning TODOArm64: Unlike arm32, arm64 has no inline assembly for performance critical code.)
+endif
+
 LOCAL_CFLAGS += \
 	-Wno-unused-parameter \
 	-U_FORTIFY_SOURCE \
-	-D_FORTIFY_SOURCE=1 \
-	-DSK_GAMMA_SRGB \
-	-DSK_GAMMA_APPLY_TO_A8 \
-	-DSK_SCALAR_TO_FLOAT_EXCLUDED \
-	-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0 \
-	-DSK_SUPPORT_GPU=1 \
-	-DSK_SUPPORT_OPENCL=0 \
-	-DSK_FORCE_DISTANCEFIELD_FONTS=0 \
-	-DSK_SCALAR_IS_FLOAT \
-	-DSK_CAN_USE_FLOAT \
-	-DDCT_IFAST_SUPPORTED \
-	-DSK_USE_FREETYPE_EMBOLDEN \
-	-DSK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400 \
-	-DSK_CAN_USE_DLOPEN=0 \
-	-DSK_BUILD_FOR_ANDROID \
-	-DSK_FONTHOST_DOES_NOT_USE_FONTMGR \
-	-DSK_USE_POSIX_THREADS \
-	-DSK_SUPPORT_PDF
+	-D_FORTIFY_SOURCE=1
 
 LOCAL_SRC_FILES := \
 	src/core/SkAAClip.cpp \
@@ -584,9 +571,6 @@ LOCAL_SRC_FILES_arm += \
 	src/opts/SkXfermode_opts_arm.cpp
 
 ifeq ($(ARCH_ARM_HAVE_NEON), true)
-LOCAL_CFLAGS_arm += \
-	-D__ARM_HAVE_NEON
-
 LOCAL_SRC_FILES_arm += \
 	src/opts/memset16_neon.S \
 	src/opts/memset32_neon.S \
@@ -598,6 +582,9 @@ LOCAL_SRC_FILES_arm += \
 	src/opts/SkMorphology_opts_neon.cpp \
 	src/opts/SkXfermode_opts_arm_neon.cpp
 
+LOCAL_CFLAGS_arm += \
+	-D__ARM_HAVE_NEON
+
 endif
 
 LOCAL_SRC_FILES_x86 += \
@@ -633,6 +620,15 @@ LOCAL_SRC_FILES_mips += \
 	src/opts/SkUtils_opts_none.cpp \
 	src/opts/SkXfermode_opts_none.cpp
 
+LOCAL_SRC_FILES_arm64 += \
+	src/opts/SkBitmapProcState_opts_none.cpp \
+	src/opts/SkBlitMask_opts_none.cpp \
+	src/opts/SkBlitRow_opts_none.cpp \
+	src/opts/SkBlurImage_opts_none.cpp \
+	src/opts/SkMorphology_opts_none.cpp \
+	src/opts/SkUtils_opts_none.cpp \
+	src/opts/SkXfermode_opts_none.cpp
+
 include external/stlport/libstlport.mk
 LOCAL_MODULE:= libskia
 include $(BUILD_SHARED_LIBRARY)