Revert "Replaces linux/linux_glibc with host"
This reverts commit ff4c3785fb351f2486a7a44e1c2a3c1553f4d4bb.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I677aade0f843bd1412a040eb1c261ed903f4dab2
diff --git a/Android.bp b/Android.bp
index f7726e6..95707b6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,10 +42,17 @@
"cuttlefish_kernel_headers",
],
target: {
- host: {
+ linux: {
host_ldlibs: ["-lrt"],
cflags: ["-DCUTTLEFISH_HOST"],
- compile_multilib: "64"
+ },
+ // We don't need 32 bit host-side builds
+ linux_x86: {
+ enabled: false,
+ },
+ // We don't need Darwin host-side builds
+ darwin: {
+ enabled: false,
},
},
cflags: ["-Werror", "-Wall"],
@@ -106,7 +113,7 @@
"liblog",
],
target: {
- host: {
+ linux: {
srcs: [
"host/vsoc/lib/gralloc_buffer_region_view.cpp",
"host/vsoc/lib/host_lock.cpp",
diff --git a/common/commands/wificlient/Android.bp b/common/commands/wificlient/Android.bp
index 7952a1f..cc2e268 100644
--- a/common/commands/wificlient/Android.bp
+++ b/common/commands/wificlient/Android.bp
@@ -18,7 +18,7 @@
"cuttlefish_glog",
],
target: {
- host: {
+ linux: {
static_libs: [
"libcuttlefish_wifi",
"libcuttlefish_host_config",
diff --git a/common/frontend/socket_forward_proxy/Android.bp b/common/frontend/socket_forward_proxy/Android.bp
index 1ffec39..367a5c2 100644
--- a/common/frontend/socket_forward_proxy/Android.bp
+++ b/common/frontend/socket_forward_proxy/Android.bp
@@ -31,7 +31,7 @@
"cuttlefish_glog",
],
target: {
- host: {
+ linux: {
static_libs: [
"libcuttlefish_host_config",
],
diff --git a/common/libs/wifi/Android.bp b/common/libs/wifi/Android.bp
index 8475bce..6a6e846 100644
--- a/common/libs/wifi/Android.bp
+++ b/common/libs/wifi/Android.bp
@@ -18,7 +18,7 @@
"cuttlefish_glog",
],
target: {
- host: {
+ linux: {
static_libs: [
"libcuttlefish_host_config",
"libgflags",