diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2013-06-27 23:19:43 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2013-06-27 23:19:43 +0000 |
commit | 1503c40fa6701c267279291c4f7f8a27be033a55 (patch) | |
tree | 79033bfd398d0f9002f6d6307566b67a65c5dcf6 /ft2.target.darwin-x86.mk | |
parent | d4a8979cfe5e3aa08b5bad2360f27f8ffafcee44 (diff) | |
download | freetype-1503c40fa6701c267279291c4f7f8a27be033a55.tar.gz |
Update makefiles after merge of Chromium at r209011
This commit was generated by merge_from_chromium.py.
Change-Id: I4e101dfde0d49cbfaffbe32226aff3481fcded02
Diffstat (limited to 'ft2.target.darwin-x86.mk')
-rw-r--r-- | ft2.target.darwin-x86.mk | 121 |
1 files changed, 112 insertions, 9 deletions
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 79d3c56..c5cea49 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -45,7 +45,7 @@ LOCAL_SRC_FILES := \ # Flags passed to both C and C++ files. -MY_CFLAGS := \ +MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ -fno-exceptions \ -fno-strict-aliasing \ @@ -82,9 +82,7 @@ MY_CFLAGS := \ -fdata-sections \ -ffunction-sections -MY_CFLAGS_C := - -MY_DEFS := \ +MY_DEFS_Debug := \ '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ @@ -108,20 +106,18 @@ MY_DEFS := \ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ '-D_DEBUG' -LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) # Include paths placed before CFLAGS/CPPFLAGS -LOCAL_C_INCLUDES := \ +LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/freetype/build \ $(LOCAL_PATH)/third_party/freetype/include \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport -LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES) # Flags passed to only C++ (and not C) files. -LOCAL_CPPFLAGS := \ +LOCAL_CPPFLAGS_Debug := \ -fno-rtti \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ @@ -131,9 +127,99 @@ LOCAL_CPPFLAGS := \ -Wno-sign-promo \ -Wno-non-virtual-dtor + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-format \ + -m32 \ + -mmmx \ + -march=pentium4 \ + -msse2 \ + -mfpmath=sse \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -fno-stack-protector \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -fno-unwind-tables \ + -fno-asynchronous-unwind-tables + +MY_DEFS_Release := \ + '-DANGLE_DX11' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DUSE_LINUX_BREAKPAD' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_GPU=1' \ + '-DUSE_OPENSSL=1' \ + '-DENABLE_EGLIMAGE=1' \ + '-DENABLE_LANGUAGE_DETECTION=1' \ + '-DFT2_BUILD_LIBRARY' \ + '-DDARWIN_NO_CARBON' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(LOCAL_PATH)/third_party/freetype/build \ + $(LOCAL_PATH)/third_party/freetype/include \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-error=c++0x-compat \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) ### Rules for final target. -LOCAL_LDFLAGS := \ +LOCAL_LDFLAGS_Debug := \ -Wl,-z,now \ -Wl,-z,relro \ -Wl,-z,noexecstack \ @@ -148,6 +234,23 @@ LOCAL_LDFLAGS := \ -Wl,--as-needed +LOCAL_LDFLAGS_Release := \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m32 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + LOCAL_STATIC_LIBRARIES := # Enable grouping to fix circular references |