diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
| commit | 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 (patch) | |
| tree | 5d4ae202b870bd86673f596f0d424bc4b3e55ebe /media/player_android.target.linux-mips.mk | |
| parent | e862bac9c33104a29d98631d62668ae7b6676510 (diff) | |
| download | chromium_org-5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7.tar.gz | |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
Diffstat (limited to 'media/player_android.target.linux-mips.mk')
| -rw-r--r-- | media/player_android.target.linux-mips.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/media/player_android.target.linux-mips.mk b/media/player_android.target.linux-mips.mk index d3df6bee0f..9dd1d952e8 100644 --- a/media/player_android.target.linux-mips.mk +++ b/media/player_android.target.linux-mips.mk @@ -65,14 +65,15 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Os \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections + -ffunction-sections \ + -funwind-tables MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -83,7 +84,6 @@ MY_DEFS_Debug := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -108,13 +108,13 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/media \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/skia/config \ $(gyp_shared_intermediate_dir)/ui/gl \ $(LOCAL_PATH)/third_party/mesa/src/include \ + $(gyp_shared_intermediate_dir)/media \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -127,7 +127,6 @@ LOCAL_CPPFLAGS_Debug := \ -fvisibility-inlines-hidden \ -Wsign-compare \ -Wno-uninitialized \ - -Wno-error=c++0x-compat \ -Wno-non-virtual-dtor \ -Wno-sign-promo @@ -159,14 +158,15 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -Os \ -fno-ident \ -fdata-sections \ -ffunction-sections \ - -fomit-frame-pointer + -fomit-frame-pointer \ + -funwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -177,7 +177,6 @@ MY_DEFS_Release := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -203,13 +202,13 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/media \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/skia/config \ $(gyp_shared_intermediate_dir)/ui/gl \ $(LOCAL_PATH)/third_party/mesa/src/include \ + $(gyp_shared_intermediate_dir)/media \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -222,7 +221,6 @@ LOCAL_CPPFLAGS_Release := \ -fvisibility-inlines-hidden \ -Wsign-compare \ -Wno-uninitialized \ - -Wno-error=c++0x-compat \ -Wno-non-virtual-dtor \ -Wno-sign-promo |