Make android framework depend on SkCodec.

Android.mk

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

[scroggo, 2015/03/19 14:35:51]

As usual, this file is not checked into our repository, but I am pretending it
is so you can see the resulting diff in the makefile.

 #
 # For bugs, please contact scroggo@google.com or djsollen@google.com
 #
 ###############################################################################
 
 BASE_PATH := $(call my-dir)
 LOCAL_PATH:= $(call my-dir)
 
 ###############################################################################
 #
@@ skipping 47 matching lines @@
         -Wno-unused-parameter \
         -U_FORTIFY_SOURCE \
         -D_FORTIFY_SOURCE=1 \
         -DSKIA_IMPLEMENTATION=1
 
 LOCAL_CPPFLAGS := \
         -std=c++11 \
         -Wno-invalid-offsetof
 
 LOCAL_SRC_FILES := \
+        src/codec/SkCodec.cpp \

[scroggo, 2015/03/19 14:35:51]

I'm not sure why these moved. They must have been pulled in through some
indirect dependency.

+        src/codec/SkCodec_libpng.cpp \
+        src/codec/SkCodec_libbmp.cpp \
+        src/codec/SkMaskSwizzler.cpp \
+        src/codec/SkMasks.cpp \
+        src/codec/SkSwizzler.cpp \
         src/c/sk_paint.cpp \
         src/c/sk_surface.cpp \
         src/core/SkAAClip.cpp \
         src/core/SkAnnotation.cpp \
         src/core/SkAdvancedTypefaceMetrics.cpp \
         src/core/SkAlphaRuns.cpp \
         src/core/SkBBHFactory.cpp \
         src/core/SkBitmap.cpp \
         src/core/SkBitmapCache.cpp \
         src/core/SkBitmapDevice.cpp \
@@ skipping 263 matching lines @@
         src/pdf/SkPDFFormXObject.cpp \
         src/pdf/SkPDFGraphicState.cpp \
         src/pdf/SkPDFImage.cpp \
         src/pdf/SkPDFPage.cpp \
         src/pdf/SkPDFResourceDict.cpp \
         src/pdf/SkPDFShader.cpp \
         src/pdf/SkPDFStream.cpp \
         src/pdf/SkPDFTypes.cpp \
         src/pdf/SkPDFUtils.cpp \
         src/core/SkForceCPlusPlusLinking.cpp \
-        src/codec/SkCodec.cpp \
-        src/codec/SkCodec_libpng.cpp \
-        src/codec/SkCodec_libbmp.cpp \
-        src/codec/SkMaskSwizzler.cpp \
-        src/codec/SkMasks.cpp \
-        src/codec/SkSwizzler.cpp \
         src/fonts/SkFontMgr_indirect.cpp \
         src/fonts/SkRemotableFontMgr.cpp \
         src/ports/SkGlobalInitialization_default.cpp \
         src/ports/SkMemory_malloc.cpp \
         src/ports/SkOSFile_posix.cpp \
         src/ports/SkOSFile_stdio.cpp \
         src/ports/SkDiscardableMemory_none.cpp \
         src/ports/SkTime_Unix.cpp \
         src/ports/SkTLS_pthread.cpp \
         src/ports/SkFontHost_FreeType.cpp \
@@ skipping 194 matching lines @@
         src/gpu/gl/SkNullGLContext.cpp \
         third_party/etc1/etc1.cpp \
         third_party/ktx/ktx.cpp \
         src/core/SkFlate.cpp
 
 LOCAL_SHARED_LIBRARIES := \
         liblog \
         libGLESv2 \
         libEGL \
         libz \
+        libpng \
         libjpeg \
-        libpng \
         libicuuc \
         libicui18n \
         libexpat \
         libft2
 
 LOCAL_STATIC_LIBRARIES := \
         libwebp-decode \
         libwebp-encode \
         libgif \
         libsfntly
 
 LOCAL_C_INCLUDES := \
+        external/libpng \
+        $(LOCAL_PATH)/include/codec \
+        $(LOCAL_PATH)/src/codec \
         $(LOCAL_PATH)/include/c \
         $(LOCAL_PATH)/include/config \
         $(LOCAL_PATH)/include/core \
         $(LOCAL_PATH)/include/pathops \
         $(LOCAL_PATH)/include/pipe \
         $(LOCAL_PATH)/include/ports \
         $(LOCAL_PATH)/include/utils \
         $(LOCAL_PATH)/include/images \
         $(LOCAL_PATH)/src/core \
         $(LOCAL_PATH)/src/sfnt \
         $(LOCAL_PATH)/src/image \
         $(LOCAL_PATH)/src/opts \
         $(LOCAL_PATH)/src/utils \
         $(LOCAL_PATH)/include/gpu \
         $(LOCAL_PATH)/src/gpu \
         $(LOCAL_PATH)/include/effects \
         $(LOCAL_PATH)/src/effects \
         external/jpeg \
         $(LOCAL_PATH)/src/lazy \
         $(LOCAL_PATH)/third_party/etc1 \
         $(LOCAL_PATH)/third_party/ktx \
         external/webp/include \
         external/giflib \
-        external/libpng \
-        $(LOCAL_PATH)/include/codec \
-        $(LOCAL_PATH)/src/codec \
         external/expat/lib \
         external/freetype/include \
         $(LOCAL_PATH)/include/utils/win \
         $(LOCAL_PATH)/src/ports \
         $(LOCAL_PATH)/src/pdf \
         external/sfntly/cpp/src \
         external/zlib
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
+        $(LOCAL_PATH)/include/codec \

[scroggo, 2015/03/19 14:35:51]

This is the interesting part.

         $(LOCAL_PATH)/include/c \
         $(LOCAL_PATH)/include/config \
         $(LOCAL_PATH)/include/core \
         $(LOCAL_PATH)/include/pathops \
         $(LOCAL_PATH)/include/pipe \
         $(LOCAL_PATH)/include/effects \
         $(LOCAL_PATH)/include/images \
         $(LOCAL_PATH)/include/ports \
         $(LOCAL_PATH)/include/utils \
         $(LOCAL_PATH)/src/utils
@@ skipping 107 matching lines @@
 
 #############################################################
 # Build the skia tools
 #
 
 # benchmark (timings)
 include $(BASE_PATH)/bench/Android.mk
 
 # diamond-master (one test to rule them all)
 include $(BASE_PATH)/dm/Android.mk