diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-25 15:10:09 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-25 15:10:09 +0000 |
| commit | ba0178ff9967f1f5e698ff00ec9c17ceb8add7f5 (patch) | |
| tree | 0f2e85f5cff7a0c7cdfbba69a895f015fc80e0c4 /libsrtp.target.linux-x86.mk | |
| parent | d615e3aacd50e7a6c9a8084058d5623038665298 (diff) | |
| download | libsrtp-ba0178ff9967f1f5e698ff00ec9c17ceb8add7f5.tar.gz | |
Update makefiles after merge of Chromium at 279716
This commit was generated by merge_from_chromium.py.
Change-Id: Ia5fd342d5196dfd92410a9274b22a1bf62008f10
Diffstat (limited to 'libsrtp.target.linux-x86.mk')
| -rw-r--r-- | libsrtp.target.linux-x86.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk index c2e621d..810dfbb 100644 --- a/libsrtp.target.linux-x86.mk +++ b/libsrtp.target.linux-x86.mk @@ -118,6 +118,7 @@ MY_DEFS_Debug := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -155,6 +156,9 @@ LOCAL_CPPFLAGS_Debug := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wno-deprecated \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor @@ -229,6 +233,7 @@ MY_DEFS_Release := \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ + '-DCLD_DATA_FROM_STATIC' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ @@ -266,6 +271,9 @@ LOCAL_CPPFLAGS_Release := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wno-deprecated \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor |