diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-07-29 12:35:29 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-07-29 12:35:29 +0000 |
| commit | 32b3539705b915f1ba9271bd3c6526b0f043a2ff (patch) | |
| tree | dfdddc44dcc21f1570423c82d34e734b777d048d /libvpx_intrinsics_neon.target.linux-arm.mk | |
| parent | 52b2d12dc4dcad93294e2db9a5756cfe337bf2d2 (diff) | |
| download | libvpx-32b3539705b915f1ba9271bd3c6526b0f043a2ff.tar.gz | |
Update makefiles after merge of Chromium at 286177
This commit was generated by merge_from_chromium.py.
Change-Id: I926a4cc9c5ceba76df0edec62225945b27352378
Diffstat (limited to 'libvpx_intrinsics_neon.target.linux-arm.mk')
| -rw-r--r-- | libvpx_intrinsics_neon.target.linux-arm.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libvpx_intrinsics_neon.target.linux-arm.mk b/libvpx_intrinsics_neon.target.linux-arm.mk index 9c6a5b2..9e67f75 100644 --- a/libvpx_intrinsics_neon.target.linux-arm.mk +++ b/libvpx_intrinsics_neon.target.linux-arm.mk @@ -39,7 +39,8 @@ LOCAL_SRC_FILES := \ third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/denoising_neon.c \ third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_convolve_neon.c \ third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_idct16x16_neon.c \ - third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.c + third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_loopfilter_16_neon.c \ + third_party/libvpx/source/libvpx/vp9/encoder/arm/neon/vp9_sad_neon.c # Flags passed to both C and C++ files. @@ -103,7 +104,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/"' \ @@ -210,7 +210,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/"' \ |