diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 10:24:50 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 10:24:50 +0100 |
| commit | 80bc6f5eb8065006f1997be0fbf429efbb748df8 (patch) | |
| tree | 1547df6e9f21115b19630437251e1ddf1361dfdd /libvpx.target.linux-arm.mk | |
| parent | 465f536e656d6658a4d81a6a441a5f9fcda1a9dd (diff) | |
| download | libvpx-80bc6f5eb8065006f1997be0fbf429efbb748df8.tar.gz | |
Update makefiles after merge of Chromium at 269467
This commit was generated by merge_from_chromium.py.
Change-Id: I0b0b3951dab803165a2ec62b5b08714cd428e8cb
Diffstat (limited to 'libvpx.target.linux-arm.mk')
| -rw-r--r-- | libvpx.target.linux-arm.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libvpx.target.linux-arm.mk b/libvpx.target.linux-arm.mk index ff33589..62c92b9 100644 --- a/libvpx.target.linux-arm.mk +++ b/libvpx.target.linux-arm.mk @@ -1040,8 +1040,8 @@ MY_CFLAGS_Debug := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wa,-I,/automerger/android-src/external/chromium_org/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \ - -Wa,-I,/automerger/android-src/external/chromium_org/third_party/libvpx/source/config \ + -Wa,-I,/usr/local/google/code/android/master-chromium/external/chromium_org/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \ + -Wa,-I,/usr/local/google/code/android/master-chromium/external/chromium_org/third_party/libvpx/source/config \ -Wa,-I,$(gyp_shared_intermediate_dir)/third_party/libvpx \ -Wa,-mfpu=neon \ -Wno-format \ @@ -1087,6 +1087,7 @@ MY_DEFS_Debug := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -1132,8 +1133,8 @@ MY_CFLAGS_Release := \ -fvisibility=hidden \ -pipe \ -fPIC \ - -Wa,-I,/automerger/android-src/external/chromium_org/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \ - -Wa,-I,/automerger/android-src/external/chromium_org/third_party/libvpx/source/config \ + -Wa,-I,/usr/local/google/code/android/master-chromium/external/chromium_org/third_party/libvpx/source/config/linux/arm-neon-cpu-detect \ + -Wa,-I,/usr/local/google/code/android/master-chromium/external/chromium_org/third_party/libvpx/source/config \ -Wa,-I,$(gyp_shared_intermediate_dir)/third_party/libvpx \ -Wa,-mfpu=neon \ -Wno-format \ @@ -1179,6 +1180,7 @@ MY_DEFS_Release := \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ + '-DVIDEO_HOLE=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ |