Android.mk - Issue 89753003: Update freetype to latest version of ASOP.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 1 month 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 side-by-side diff with in-line comments

Download patch

Index: Android.mk

diff --git a/Android.mk b/Android.mk

index 51ae31bb72407bb8f5c954c6fdd1edbf098341e9..e3573971072b3d55dcb26cd43788833a1de5b2b9 100644

--- a/Android.mk

+++ b/Android.mk

@@ -37,13 +37,17 @@ LOCAL_SRC_FILES:= \

LOCAL_C_INCLUDES += \

$(LOCAL_PATH)/builds \

- $(LOCAL_PATH)/include

+ $(LOCAL_PATH)/include \

+ external/libpng \

+ external/zlib

LOCAL_CFLAGS += -W -Wall

LOCAL_CFLAGS += -fPIC -DPIC

LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"

LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"

+LOCAL_SHARED_LIBRARIES += libpng libz

# the following is for testing only, and should not be used in final builds

# of the product

#LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"

@@ -52,5 +56,5 @@ LOCAL_CFLAGS += -O2

LOCAL_MODULE:= libft2

-include $(BUILD_STATIC_LIBRARY)

+include $(BUILD_SHARED_LIBRARY)

endif

« no previous file with comments | « no previous file | README.chromium » ('j') | no next file with comments »