diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:26:12 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:26:12 +0000 |
commit | 43e7502580f146aa5b3db8267ba6dbb5c733a489 (patch) | |
tree | cbba66957767e4e99ee7fee3e4f7d9c766db6727 /Source/devtools/devtools_html.target.darwin-arm.mk | |
parent | 232dcf98f0a870e5f6ded1f05cf10dc1df48f13f (diff) | |
download | WebKit-43e7502580f146aa5b3db8267ba6dbb5c733a489.tar.gz |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: I28602a0bfd7a629ec7a60a73debd10637ad32fd4
Diffstat (limited to 'Source/devtools/devtools_html.target.darwin-arm.mk')
-rw-r--r-- | Source/devtools/devtools_html.target.darwin-arm.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/devtools/devtools_html.target.darwin-arm.mk b/Source/devtools/devtools_html.target.darwin-arm.mk index 0087289c1..d12749675 100644 --- a/Source/devtools/devtools_html.target.darwin-arm.mk +++ b/Source/devtools/devtools_html.target.darwin-arm.mk @@ -85,7 +85,6 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=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' \ @@ -170,7 +169,6 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=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' \ |