diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-08-04 09:24:42 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-08-04 09:24:42 +0000 |
| commit | 8661714f95315bd471674b14e682aa6991eb370f (patch) | |
| tree | 7451e68ab8bb0edaedcadb34934faf90e9df7e23 /video_engine/video_engine_core.target.linux-arm.mk | |
| parent | fa5085428e6672f7f9e88a652e3c4a7f9c93d116 (diff) | |
| download | webrtc-8661714f95315bd471674b14e682aa6991eb370f.tar.gz | |
Update makefiles after merge of Chromium at 287308
This commit was generated by merge_from_chromium.py.
Change-Id: I85bf9681e9c3bbef9f67d93b3d275289e6911e3c
Diffstat (limited to 'video_engine/video_engine_core.target.linux-arm.mk')
| -rw-r--r-- | video_engine/video_engine_core.target.linux-arm.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/video_engine/video_engine_core.target.linux-arm.mk b/video_engine/video_engine_core.target.linux-arm.mk index 05035c53..3f579efa 100644 --- a/video_engine/video_engine_core.target.linux-arm.mk +++ b/video_engine/video_engine_core.target.linux-arm.mk @@ -117,7 +117,6 @@ 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/"' \ @@ -240,7 +239,6 @@ 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/"' \ |