commit 2c4cca58b7fcfd80fbbdfe991b737cc612dff44d
author Greg Hartman <ghartman@google.com> Tue Mar 20 18:54:54 2018 -0700
committer Jorge Moreira Broche <jemoreira@google.com> Thu Mar 22 22:10:46 2018 +0000
tree a0f92bf2a1c5947bffc5be2c049196836acf0bf4
parent 97476172cc13aca726b9510cf64ebc126fda837d

Squash linux_glibc that sneaked in via wifi

Test: Local build
BUG: 74073528
Change-Id: Ic2c90d50d730c75f8e983281548a864e03ba4462

common/commands/wifi_relay/Android.bp

diff --git a/common/commands/wifi_relay/Android.bp b/common/commands/wifi_relay/Android.bp
index ab85c07..e39accd 100644
--- a/common/commands/wifi_relay/Android.bp
+++ b/common/commands/wifi_relay/Android.bp
@@ -29,22 +29,17 @@
     static_libs: [
         "libgflags",
         "libcuttlefish_wifi_relay",
+        "libcuttlefish_wifi",
     ],
     header_libs: [
         "cuttlefish_glog",
     ],
     target: {
-        linux_glibc: {
+        host: {
             static_libs: [
-                "libcuttlefish_wifi",
                 "libcuttlefish_host_config",
             ],
         },
-        android: {
-            static_libs: [
-                "libcuttlefish_wifi",
-            ],
-        }
     },
     defaults: ["cuttlefish_host_and_guest", "cuttlefish_native_isa"]
 }

common/libs/wifi_relay/Android.bp

diff --git a/common/libs/wifi_relay/Android.bp b/common/libs/wifi_relay/Android.bp
index 8680364..fea115b 100644
--- a/common/libs/wifi_relay/Android.bp
+++ b/common/libs/wifi_relay/Android.bp
@@ -13,7 +13,7 @@
         "cuttlefish_glog",
     ],
     target: {
-        linux_glibc: {
+        host: {
             static_libs: [
                 "libcuttlefish_host_config",
                 "libgflags",