diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
| commit | a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch) | |
| tree | 3437151d9ae1ce20a1e53a0d98c19ca01c786394 /components/web_contents_delegate_android_jni_headers.target.linux-mips.mk | |
| parent | af5066f1e36c6579e74752647e6c584438f80f94 (diff) | |
| download | chromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz | |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'components/web_contents_delegate_android_jni_headers.target.linux-mips.mk')
| -rw-r--r-- | components/web_contents_delegate_android_jni_headers.target.linux-mips.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk b/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk index 3dff918ec3..ea095ae253 100644 --- a/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk +++ b/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk @@ -103,6 +103,7 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -110,13 +111,14 @@ 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' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DUSE_OPENSSL=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -183,6 +185,7 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -190,13 +193,14 @@ 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' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DUSE_OPENSSL=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -231,6 +235,7 @@ LOCAL_CPPFLAGS_Release := \ 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)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. # Add target alias to "gyp_all_modules" target. .PHONY: gyp_all_modules |