summaryrefslogtreecommitdiff
path: root/libyuv.target.darwin-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-03 11:50:47 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-03 11:50:47 +0000
commite5bbf94e757c2ccc30fbce5348d9f498d7798c7d (patch)
tree0b258080a81abde4f80a1e63fd88aa7644e2740e /libyuv.target.darwin-x86.mk
parent1e3fac540760731c473fe1b0856cc3f2111c6ec7 (diff)
downloadlibyuv-e5bbf94e757c2ccc30fbce5348d9f498d7798c7d.tar.gz
Update makefiles after merge of Chromium at 274467
This commit was generated by merge_from_chromium.py. Change-Id: Id848f895a78613dcaac343dda5e9ccd1f8ccda40
Diffstat (limited to 'libyuv.target.darwin-x86.mk')
-rw-r--r--libyuv.target.darwin-x86.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/libyuv.target.darwin-x86.mk b/libyuv.target.darwin-x86.mk
index 38bb524..74a7630 100644
--- a/libyuv.target.darwin-x86.mk
+++ b/libyuv.target.darwin-x86.mk
@@ -108,7 +108,6 @@ MY_DEFS_Debug := \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
- '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
@@ -205,7 +204,6 @@ MY_DEFS_Release := \
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
- '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \