diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-04-02 12:40:06 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-04-02 12:40:06 +0000 |
| commit | c79e9a3f53bc954d0b370fb29468578611bb4d7d (patch) | |
| tree | 608c0cb84ca8bdd8eec3d5001864d15bff71a74f | |
| parent | aea0be63ed27809183f555f08e2c832d8509c6c2 (diff) | |
| download | freetype-c79e9a3f53bc954d0b370fb29468578611bb4d7d.tar.gz | |
Update makefiles after merge of Chromium at r191819
This commit was generated by merge_from_chromium.py.
Change-Id: Ia82428b7481fb702fb2a03b1a870ab4a17567712
| -rw-r--r-- | ft2.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 014e9f6..8f87bd2 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -83,7 +83,6 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ - '-DUSE_SKIA' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ @@ -91,7 +90,6 @@ MY_DEFS := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_PEPPER_THREADING' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 926a75c..9ff70de 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -60,6 +60,7 @@ MY_CFLAGS := \ -march=pentium4 \ -msse2 \ -mfpmath=sse \ + -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -84,7 +85,6 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ - '-DUSE_SKIA' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ @@ -92,7 +92,6 @@ MY_DEFS := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_PEPPER_THREADING' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -139,6 +138,7 @@ LOCAL_LDFLAGS := \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ + -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ |