diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-01-04 14:23:52 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-01-04 14:23:52 +0000 |
| commit | 66be170aabfedb497ecadc78e9a208ae68f01461 (patch) | |
| tree | 7135e08888900dd8a13b14361a56fcdca31d4a7d | |
| parent | 8ccca7b685e0f5c89e500d61c9ca7d2c0e2c3084 (diff) | |
| download | freetype-66be170aabfedb497ecadc78e9a208ae68f01461.tar.gz | |
Update makefiles after merge of Chromium at 243030
This commit was generated by merge_from_chromium.py.
Change-Id: I396b1818b06016f345b748f7b1aeff49ce674e18
| -rw-r--r-- | ft2.target.darwin-arm.mk | 12 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 12 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 12 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 12 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 12 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 12 |
6 files changed, 66 insertions, 6 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index b0a87db..1207044 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ '-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 @@ MY_DEFS_Debug := \ 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 @@ MY_DEFS_Release := \ '-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 @@ MY_DEFS_Release := \ 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 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 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ '-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 @@ MY_DEFS_Debug := \ 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 @@ MY_DEFS_Release := \ '-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 @@ MY_DEFS_Release := \ 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 diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index dadfc4d..f6b417c 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ 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 \ @@ -101,6 +101,9 @@ MY_DEFS_Debug := \ '-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' \ @@ -115,6 +118,8 @@ MY_DEFS_Debug := \ 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 @@ -191,6 +196,9 @@ MY_DEFS_Release := \ '-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' \ @@ -205,6 +213,8 @@ MY_DEFS_Release := \ 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 diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index b0a87db..1207044 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ '-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 @@ MY_DEFS_Debug := \ 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 @@ MY_DEFS_Release := \ '-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 @@ MY_DEFS_Release := \ 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 diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 1cced33..717adae 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ 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 @@ MY_DEFS_Debug := \ '-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 @@ MY_DEFS_Debug := \ 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 @@ MY_DEFS_Release := \ '-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 @@ MY_DEFS_Release := \ 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 diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index dadfc4d..f6b417c 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -28,12 +28,12 @@ LOCAL_SRC_FILES := \ 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 \ @@ -101,6 +101,9 @@ MY_DEFS_Debug := \ '-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' \ @@ -115,6 +118,8 @@ MY_DEFS_Debug := \ 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 @@ -191,6 +196,9 @@ MY_DEFS_Release := \ '-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' \ @@ -205,6 +213,8 @@ MY_DEFS_Release := \ 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 |