commit 98d18af791d36d55e5a0ea3fe11e1e2373179053
author Greg Hartman <ghartman@google.com> Tue Dec 05 13:12:31 2017 -0800
committer Greg Hartman <ghartman@google.com> Tue Dec 05 15:04:56 2017 -0800
tree 51d3cb7835a7002b2f1d00c5fb01564fb182cb58
parent 82f748d39153f51344e05d485d0ec14cf7743223

Fixes for lib_vsoc

Change-Id: I9c77a4f3dc50ddddda088df324d1083f56b453a8

Android.bp

diff --git a/Android.bp b/Android.bp
index d19dcb6..1a49b68 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,6 +79,15 @@
     },
 }
 
+cc_defaults {
+    name: "cuttlefish_intel_only",
+    target : {
+        android_arm: {
+            enabled: false,
+        },
+    },
+}
+
 cc_library {
     name: "vsoc_lib",
     srcs: [
@@ -96,9 +105,13 @@
     ],
     static_libs: [
         "libcuttlefish_fs",
+        "cuttlefish_auto_resources",
         "libbase",
         "libgflags",
     ],
+    shared_libs: [
+        "liblog",
+    ],
     target: {
         linux: {
             host_ldlibs: ["-lrt"],
@@ -117,7 +130,7 @@
             ],
         },
     },
-    defaults: ["cuttlefish_common"],
+    defaults: ["cuttlefish_common", "cuttlefish_intel_only"],
 }
 
 cc_library_host_static {