diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-01-03 18:55:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-01-03 18:55:52 +0000 |
| commit | c3649bb6f07a467d45b86ef37501c5b573e40e93 (patch) | |
| tree | 287331fd16963259c3966714feb0126e25b9ab87 | |
| parent | 1c062ca8703625b6495ed039f907789ffbf131b3 (diff) | |
| parent | bded9f1fc6f6697e27e1e5ab1e0984a13609bea6 (diff) | |
| download | libvpx-c3649bb6f07a467d45b86ef37501c5b573e40e93.tar.gz | |
Merge "Re-enable building libvpx on the host, but not for mac"
| -rw-r--r-- | Android.bp | 13 | ||||
| -rw-r--r-- | Android.bp.in | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index af176c93b..70e113c07 100644 --- a/Android.bp +++ b/Android.bp @@ -1105,8 +1105,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: { @@ -1127,11 +1134,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 7cead74e7..91a0ec645 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", + ], }, }, |