diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-07 11:28:24 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-07 11:28:24 +0000 |
commit | 538564e18d556b0acfd1aa25697071fa0573bb9d (patch) | |
tree | 46b582cc11c77dc0ad500c636399846928cce51c /ft2.target.linux-mips.mk | |
parent | b1c56ea357d354bdc71677832a062400afa3324b (diff) | |
download | freetype-538564e18d556b0acfd1aa25697071fa0573bb9d.tar.gz |
Update makefiles after merge of Chromium at 262110
This commit was generated by merge_from_chromium.py.
Change-Id: Iaec82e5a55d2ffd70c369a4591575b728bd916ce
Diffstat (limited to 'ft2.target.linux-mips.mk')
-rw-r--r-- | ft2.target.linux-mips.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 13ce530..b2b21f1 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -90,7 +90,6 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -186,7 +185,6 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ - '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -243,9 +241,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ @@ -260,9 +258,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -EL \ |