Updates to Android.mk generation.

Android.mk

 
 ###############################################################################
 #
 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
 #
 ###############################################################################

[djsollen, 2014/03/26 13:07:53]

Is this file just for reference? Or do you plan to check it in?

[scroggo, 2014/03/26 15:58:39]

Just for reference. I realized that reitveld shows the diff between your branch
and the branch it's based on, so I checked out a branch, generated the makefile
using gyp_to_android, and committed it. Then I checked out a new branch based
off that one, made my changes, and generated the makefile again. This diff shows
that difference. If I try to commit as is, it will fail, so I'll need to rebase
off master and remove the changes to this file (which doesn't exist), but it's
an easy way for you to see what difference this change will make.

 
 BASE_PATH := $(call my-dir)
 LOCAL_PATH:= $(call my-dir)
 
 ###############################################################################
 #
 # PROBLEMS WITH SKIA DEBUGGING?? READ THIS...
 #
 # The debug build results in changes to the Skia headers. This means that those
 # using libskia must also be built with the debug version of the Skia headers.
@@ skipping 25 matching lines @@
         LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE
 endif
 
 # used for testing
 #LOCAL_CFLAGS += -g -O0
 
 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 \
         src/core/SkAnnotation.cpp \
         src/core/SkAdvancedTypefaceMetrics.cpp \
         src/core/SkAlphaRuns.cpp \
         src/core/SkBBoxRecord.cpp \
         src/core/SkBBoxHierarchyRecord.cpp \
         src/core/SkBitmap.cpp \
         src/core/SkBitmapDevice.cpp \
@@ skipping 493 matching lines @@
         src/opts/memset.arm.S \
         src/opts/SkBitmapProcState_opts_arm.cpp \
         src/opts/SkBlitMask_opts_arm.cpp \
         src/opts/SkBlitRow_opts_arm.cpp \
         src/opts/SkBlurImage_opts_arm.cpp \
         src/opts/SkMorphology_opts_arm.cpp \
         src/opts/SkUtils_opts_arm.cpp \
         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 \
         src/opts/SkBitmapProcState_arm_neon.cpp \
         src/opts/SkBitmapProcState_matrixProcs_neon.cpp \
         src/opts/SkBlitMask_opts_arm_neon.cpp \
         src/opts/SkBlitRow_opts_arm_neon.cpp \
         src/opts/SkBlurImage_opts_neon.cpp \
         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 += \
         src/opts/opts_check_SSE2.cpp \
         src/opts/SkBitmapProcState_opts_SSE2.cpp \
         src/opts/SkBitmapFilter_opts_SSE2.cpp \
         src/opts/SkBlitRow_opts_SSE2.cpp \
         src/opts/SkBlitRect_opts_SSE2.cpp \
         src/opts/SkBlurImage_opts_SSE2.cpp \
         src/opts/SkMorphology_opts_SSE2.cpp \
@@ skipping 15 matching lines @@
 
 LOCAL_SRC_FILES_mips += \
         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
 
+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)
 
 #############################################################
 # Build the skia tools
 #
 
 # benchmark (timings)
 #include $(BASE_PATH)/bench/Android.mk
 
 # golden-master (fidelity / regression test)
 #include $(BASE_PATH)/gm/Android.mk
 
 # unit-tests
 #include $(BASE_PATH)/tests/Android.mk
 
 # pathOps unit-tests
 # TODO include those sources!