Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(591)

Side by Side Diff: Android.mk

Issue 89753003: Update freetype to latest version of ASOP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src/third_party/freetype.git@master
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | README.chromium » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # this is now the default FreeType build for Android 1 # this is now the default FreeType build for Android
2 # 2 #
3 ifndef USE_FREETYPE 3 ifndef USE_FREETYPE
4 USE_FREETYPE := 2.4.2 4 USE_FREETYPE := 2.4.2
5 endif 5 endif
6 6
7 ifeq ($(USE_FREETYPE),2.4.2) 7 ifeq ($(USE_FREETYPE),2.4.2)
8 LOCAL_PATH:= $(call my-dir) 8 LOCAL_PATH:= $(call my-dir)
9 include $(CLEAR_VARS) 9 include $(CLEAR_VARS)
10 10
(...skipping 19 matching lines...) Expand all
30 src/sfnt/sfnt.c \ 30 src/sfnt/sfnt.c \
31 src/smooth/smooth.c \ 31 src/smooth/smooth.c \
32 src/autofit/autofit.c \ 32 src/autofit/autofit.c \
33 src/truetype/truetype.c \ 33 src/truetype/truetype.c \
34 src/cff/cff.c \ 34 src/cff/cff.c \
35 src/psnames/psnames.c \ 35 src/psnames/psnames.c \
36 src/pshinter/pshinter.c 36 src/pshinter/pshinter.c
37 37
38 LOCAL_C_INCLUDES += \ 38 LOCAL_C_INCLUDES += \
39 $(LOCAL_PATH)/builds \ 39 $(LOCAL_PATH)/builds \
40 » $(LOCAL_PATH)/include 40 » $(LOCAL_PATH)/include \
41 » external/libpng \
42 » external/zlib
41 43
42 LOCAL_CFLAGS += -W -Wall 44 LOCAL_CFLAGS += -W -Wall
43 LOCAL_CFLAGS += -fPIC -DPIC 45 LOCAL_CFLAGS += -fPIC -DPIC
44 LOCAL_CFLAGS += "-DDARWIN_NO_CARBON" 46 LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
45 LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY" 47 LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
46 48
49 LOCAL_SHARED_LIBRARIES += libpng libz
50
47 # the following is for testing only, and should not be used in final builds 51 # the following is for testing only, and should not be used in final builds
48 # of the product 52 # of the product
49 #LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER" 53 #LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
50 54
51 LOCAL_CFLAGS += -O2 55 LOCAL_CFLAGS += -O2
52 56
53 LOCAL_MODULE:= libft2 57 LOCAL_MODULE:= libft2
54 58
55 include $(BUILD_STATIC_LIBRARY) 59 include $(BUILD_SHARED_LIBRARY)
56 endif 60 endif
OLDNEW
« no previous file with comments | « no previous file | README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698