diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-25 15:10:10 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-25 15:10:10 +0000 |
| commit | 841f8c8a99058c853fe9c1f16ec0729f90cb6dd0 (patch) | |
| tree | 5b5734d55a6021b9d7d773e1024dc0fb3289b17e /video_engine/video_engine_core.target.linux-arm.mk | |
| parent | 4c21d3a8817eb02f39b986c257f171da3166ecfc (diff) | |
| download | webrtc-841f8c8a99058c853fe9c1f16ec0729f90cb6dd0.tar.gz | |
Update makefiles after merge of Chromium at 279716
This commit was generated by merge_from_chromium.py.
Change-Id: Ie631c1eeed85862b7bade8e178791c7b230573b3
Diffstat (limited to 'video_engine/video_engine_core.target.linux-arm.mk')
| -rw-r--r-- | video_engine/video_engine_core.target.linux-arm.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/video_engine/video_engine_core.target.linux-arm.mk b/video_engine/video_engine_core.target.linux-arm.mk index 03d56d9a..e7ed8472 100644 --- a/video_engine/video_engine_core.target.linux-arm.mk +++ b/video_engine/video_engine_core.target.linux-arm.mk @@ -117,6 +117,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/"' \ @@ -171,6 +172,9 @@ LOCAL_CPPFLAGS_Debug := \ -fvisibility-inlines-hidden \ -Wsign-compare \ -Wno-abi \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo @@ -236,6 +240,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/"' \ @@ -291,6 +296,9 @@ LOCAL_CPPFLAGS_Release := \ -fvisibility-inlines-hidden \ -Wsign-compare \ -Wno-abi \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo |