Update makefiles after merge of Chromium at 243030
This commit was generated by merge_from_chromium.py.
Change-Id: I396b1818b06016f345b748f7b1aeff49ce674e18
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 1cced33..717adae 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -28,12 +28,12 @@
third_party/freetype/src/base/ftglyph.c \
third_party/freetype/src/base/ftlcdfil.c \
third_party/freetype/src/base/ftstroke.c \
+ third_party/freetype/src/base/fttype1.c \
third_party/freetype/src/base/ftxf86.c \
third_party/freetype/src/base/ftbase.c \
third_party/freetype/src/base/ftsystem.c \
third_party/freetype/src/base/ftinit.c \
third_party/freetype/src/base/ftgasp.c \
- third_party/freetype/src/base/fttype1.c \
third_party/freetype/src/raster/raster.c \
third_party/freetype/src/sfnt/sfnt.c \
third_party/freetype/src/smooth/smooth.c \
@@ -99,6 +99,9 @@
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
+ '-DCHROME_PNG_WRITE_SUPPORT' \
+ '-DPNG_USER_CONFIG' \
+ '-DCHROME_PNG_READ_PACK_SUPPORT' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -113,6 +116,8 @@
LOCAL_C_INCLUDES_Debug := \
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
+ $(LOCAL_PATH)/third_party/libpng \
+ $(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -186,6 +191,9 @@
'-DENABLE_MANAGED_USERS=1' \
'-DFT2_BUILD_LIBRARY' \
'-DDARWIN_NO_CARBON' \
+ '-DCHROME_PNG_WRITE_SUPPORT' \
+ '-DPNG_USER_CONFIG' \
+ '-DCHROME_PNG_READ_PACK_SUPPORT' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -200,6 +208,8 @@
LOCAL_C_INCLUDES_Release := \
$(LOCAL_PATH)/third_party/freetype/build \
$(LOCAL_PATH)/third_party/freetype/include \
+ $(LOCAL_PATH)/third_party/libpng \
+ $(LOCAL_PATH)/third_party/zlib \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport