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 | f15f350f41d56d2317c4c8e0ddbe1126ea3a0daa (patch) | |
| tree | c0a60d29a45f817f3f71256abebf3f0b539b1363 /libvpx_asm_offsets_vp8.target.darwin-arm.mk | |
| parent | bd92bdeebd4ce09cde7d95a26a58aa7f0bcff570 (diff) | |
| download | libvpx-f15f350f41d56d2317c4c8e0ddbe1126ea3a0daa.tar.gz | |
Update makefiles after merge of Chromium at 279716
This commit was generated by merge_from_chromium.py.
Change-Id: I6a4240749bc71690c8d4d857b7c9708452bbe975
Diffstat (limited to 'libvpx_asm_offsets_vp8.target.darwin-arm.mk')
| -rw-r--r-- | libvpx_asm_offsets_vp8.target.darwin-arm.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libvpx_asm_offsets_vp8.target.darwin-arm.mk b/libvpx_asm_offsets_vp8.target.darwin-arm.mk index 0bad677..4c2c673 100644 --- a/libvpx_asm_offsets_vp8.target.darwin-arm.mk +++ b/libvpx_asm_offsets_vp8.target.darwin-arm.mk @@ -86,6 +86,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/"' \ @@ -124,6 +125,9 @@ LOCAL_CPPFLAGS_Debug := \ -fvisibility-inlines-hidden \ -Wno-deprecated \ -Wno-abi \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor @@ -189,6 +193,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/"' \ @@ -227,6 +232,9 @@ LOCAL_CPPFLAGS_Release := \ -fvisibility-inlines-hidden \ -Wno-deprecated \ -Wno-abi \ + -std=gnu++11 \ + -Wno-narrowing \ + -Wno-literal-suffix \ -Wno-non-virtual-dtor \ -Wno-sign-promo \ -Wno-non-virtual-dtor |