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 | 062c7d9db180ecc98c8aaaacf19d5e05d05ad035 (patch) | |
| tree | 8a1b99a16c47baf9aac7451c201ca516d435ac89 /ft2.target.linux-arm.mk | |
| parent | a537a45691ec6cdddbc7c6ef136371fd29eed4a0 (diff) | |
| download | freetype-062c7d9db180ecc98c8aaaacf19d5e05d05ad035.tar.gz | |
Update makefiles after merge of Chromium at 279716
This commit was generated by merge_from_chromium.py.
Change-Id: I7dbbf5bd88422650cd0ab7ab0cf5574130b3a1bf
Diffstat (limited to 'ft2.target.linux-arm.mk')
| -rw-r--r-- | ft2.target.linux-arm.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 9bf69d9..9a1b7c4 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -105,6 +105,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/"' \ @@ -149,6 +150,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 @@ -214,6 +218,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/"' \ @@ -258,6 +263,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 |