commit 685e97189550e168e9618efb154e080b5787b236
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 03 19:36:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 03 19:36:44 2020 +0000
tree 111f718c448c3b238b0e2679c9b882fa2f935edb
parent 056249e8bebc122058772ff14b3d20e0727265c4
parent 610807016708048f6bf4a86bfb643a82d12fa2d9

Merge "Re-enable building libvpx on the host, but not for mac" am: c3649bb6f0 am: 92511d0e1d am: 6108070167

Change-Id: I06fd0d694f4da85fa3e635006a1343c28285c08e

Android.bp

diff --git a/Android.bp b/Android.bp
index 17616a3..68cc33c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1086,8 +1086,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: {
@@ -1108,11 +1115,17 @@
         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",
+            ],
         },
     },
 

Android.bp.in

diff --git a/Android.bp.in b/Android.bp.in
index 7cead74..91a0ec6 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 @@
         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",
+            ],
         },
     },