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 | 4d51902301f0c8ebbfd0d2b326749315bc8ed1f7 (patch) | |
| tree | 0c6dfc4acac40ae7a22ec0281fa3089ebdef0496 /dl/openmax_dl_armv7.target.linux-arm.mk | |
| parent | 1e0c871908185f34ace0c110d3923e3bcbd846c7 (diff) | |
| download | openmax_dl-4d51902301f0c8ebbfd0d2b326749315bc8ed1f7.tar.gz | |
Update makefiles after merge of Chromium at 279716
This commit was generated by merge_from_chromium.py.
Change-Id: Icbeac1e633699ac7a2eb41b54f5cca6348d3ae68
Diffstat (limited to 'dl/openmax_dl_armv7.target.linux-arm.mk')
| -rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index 9cb4963..23b31e0 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -95,6 +95,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/"' \ @@ -131,6 +132,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 @@ -196,6 +200,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/"' \ @@ -232,6 +237,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 |