Make android framework depend on SkCodec.

Make android framework depend on SkCodec.

This results in exporting include/codec so the framework can use it.

Committed: https://skia.googlesource.com/skia/+/3614f123e82b1c3311d43b6aa451a335b4082b82

[scroggo, 2015-03-19 14:35:50]

scroggo@google.com changed reviewers:
+ djsollen@google.com, msarett@google.com

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

https://codereview.chromium.org/1020903002/diff/1/Android.mk
File Android.mk (right):

https://codereview.chromium.org/1020903002/diff/1/Android.mk#newcode4
Android.mk:4: # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
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.

https://codereview.chromium.org/1020903002/diff/1/Android.mk#newcode72
Android.mk:72: src/codec/SkCodec.cpp \
I'm not sure why these moved. They must have been pulled in through some
indirect dependency.

https://codereview.chromium.org/1020903002/diff/1/Android.mk#newcode624
Android.mk:624: $(LOCAL_PATH)/include/codec \
This is the interesting part.

https://codereview.chromium.org/1020903002/diff/1/gyp/android_framework_lib.gyp
File gyp/android_framework_lib.gyp (right):

https://codereview.chromium.org/1020903002/diff/1/gyp/android_framework_lib.g...
gyp/android_framework_lib.gyp:11: 'codec.gyp:codec',
And this is the only change to the upstream repository.

[djsollen, 2015-03-20 17:52:24]

lgtm

[scroggo, 2015-03-20 18:00:39]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2015-03-20 18:01:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1020903002/1

[commit-bot: I haz the power, 2015-03-20 18:01:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-20 18:01:25]

Failed to apply patch for Android.mk:
While running git apply --index -3 -p1;
  error: Android.mk: does not exist in index

Patch:       Android.mk
Index: Android.mk
diff --git a/Android.mk b/Android.mk
index
4747204e1a7d52578e6de72ac08b1034016eade6..96920118a1f975f8e84bbad1430c39d3d0031d0a
100644
--- a/Android.mk
+++ b/Android.mk
@@ -69,6 +69,12 @@ LOCAL_CPPFLAGS := \
 	-Wno-invalid-offsetof
 
 LOCAL_SRC_FILES := \
+	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/c/sk_paint.cpp \
 	src/c/sk_surface.cpp \
 	src/core/SkAAClip.cpp \
@@ -352,12 +358,6 @@ LOCAL_SRC_FILES := \
 	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 \
@@ -572,8 +572,8 @@ LOCAL_SHARED_LIBRARIES := \
 	libGLESv2 \
 	libEGL \
 	libz \
-	libjpeg \
 	libpng \
+	libjpeg \
 	libicuuc \
 	libicui18n \
 	libexpat \
@@ -586,6 +586,9 @@ LOCAL_STATIC_LIBRARIES := \
 	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 \
@@ -609,9 +612,6 @@ LOCAL_C_INCLUDES := \
 	$(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 \
@@ -621,6 +621,7 @@ LOCAL_C_INCLUDES := \
 	external/zlib
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
+	$(LOCAL_PATH)/include/codec \
 	$(LOCAL_PATH)/include/c \
 	$(LOCAL_PATH)/include/config \
 	$(LOCAL_PATH)/include/core \

[scroggo, 2015-03-20 18:14:19]

The CQ bit was checked by scroggo@google.com

[scroggo, 2015-03-20 18:14:20]

The patchset sent to the CQ was uploaded after l-g-t-m from djsollen@google.com
Link to the patchset: https://codereview.chromium.org/1020903002/#ps20001
(title: "Remove extraneous Android.mk changes")

[commit-bot: I haz the power, 2015-03-20 18:14:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1020903002/20001

[commit-bot: I haz the power, 2015-03-20 18:20:08]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/3614f123e82b1c3311d43b6aa451a335b4082b82