diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-03 19:36:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-03 19:36:44 +0000 |
| commit | 685e97189550e168e9618efb154e080b5787b236 (patch) | |
| tree | 111f718c448c3b238b0e2679c9b882fa2f935edb | |
| parent | 056249e8bebc122058772ff14b3d20e0727265c4 (diff) | |
| parent | 610807016708048f6bf4a86bfb643a82d12fa2d9 (diff) | |
| download | platform_external_libvpx-685e97189550e168e9618efb154e080b5787b236.tar.gz platform_external_libvpx-685e97189550e168e9618efb154e080b5787b236.tar.bz2 platform_external_libvpx-685e97189550e168e9618efb154e080b5787b236.zip | |
Merge "Re-enable building libvpx on the host, but not for mac" am: c3649bb6f0 am: 92511d0e1d am: 6108070167
Change-Id: I06fd0d694f4da85fa3e635006a1343c28285c08e
| -rw-r--r-- | Android.bp | 13 | ||||
| -rw-r--r-- | Android.bp.in | 13 |
2 files changed, 26 insertions, 0 deletions
@@ -1086,8 +1086,15 @@ libvpx_x86_64_asm_srcs = [ cc_library { name: "libvpx", vendor_available: true, + host_supported: true, version_script: "exports.lds", + target: { + darwin: { + enabled: false, + }, + }, + arch: { // configured to require the neon unit arm: { @@ -1108,11 +1115,17 @@ cc_library { x86: { srcs: libvpx_x86_c_srcs + libvpx_x86_asm_srcs, local_include_dirs: ["config/x86"], + cflags: [ + "-mssse3", + ], }, x86_64: { srcs: libvpx_x86_64_c_srcs + libvpx_x86_64_asm_srcs, local_include_dirs: ["config/x86_64"], + cflags: [ + "-mssse3", + ], }, }, diff --git a/Android.bp.in b/Android.bp.in index 7cead74e..91a0ec64 100644 --- a/Android.bp.in +++ b/Android.bp.in @@ -1,8 +1,15 @@ cc_library { name: "libvpx", vendor_available: true, + host_supported: true, version_script: "exports.lds", + target: { + darwin: { + enabled: false, + }, + }, + arch: { // configured to require the neon unit arm: { @@ -23,11 +30,17 @@ cc_library { x86: { srcs: libvpx_x86_c_srcs + libvpx_x86_asm_srcs, local_include_dirs: ["config/x86"], + cflags: [ + "-mssse3", + ], }, x86_64: { srcs: libvpx_x86_64_c_srcs + libvpx_x86_64_asm_srcs, local_include_dirs: ["config/x86_64"], + cflags: [ + "-mssse3", + ], }, }, |