Replaces linux/linux_glibc with host
host seems to be the portable alternative here. This CL is instead of
adding cuttlefish_cc_* rules as in ag/3685077
On O branches, the correct specific is linux{} but on P it is linux_glibc.
Host is the right way to get the right result on both.
Bug: 74073528
Test: builds
Change-Id: I0911ea517318c8221efcd502345136d39b2db72e
diff --git a/Android.bp b/Android.bp
index ee031cf..f7726e6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,17 +42,10 @@
"cuttlefish_kernel_headers",
],
target: {
- linux_glibc: {
+ host: {
host_ldlibs: ["-lrt"],
cflags: ["-DCUTTLEFISH_HOST"],
- },
- // We don't need 32 bit host-side builds
- linux_glibc_x86: {
- enabled: false,
- },
- // We don't need Darwin host-side builds
- darwin: {
- enabled: false,
+ compile_multilib: "64"
},
},
cflags: ["-Werror", "-Wall"],
@@ -113,7 +106,7 @@
"liblog",
],
target: {
- linux_glibc: {
+ host: {
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 c95460b..7952a1f 100644
--- a/common/commands/wificlient/Android.bp
+++ b/common/commands/wificlient/Android.bp
@@ -18,7 +18,7 @@
"cuttlefish_glog",
],
target: {
- linux_glibc: {
+ host: {
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 f8fd78f..1ffec39 100644
--- a/common/frontend/socket_forward_proxy/Android.bp
+++ b/common/frontend/socket_forward_proxy/Android.bp
@@ -31,7 +31,7 @@
"cuttlefish_glog",
],
target: {
- linux_glibc: {
+ host: {
static_libs: [
"libcuttlefish_host_config",
],
diff --git a/common/libs/wifi/Android.bp b/common/libs/wifi/Android.bp
index d3c4bb1..8475bce 100644
--- a/common/libs/wifi/Android.bp
+++ b/common/libs/wifi/Android.bp
@@ -18,7 +18,7 @@
"cuttlefish_glog",
],
target: {
- linux_glibc: {
+ host: {
static_libs: [
"libcuttlefish_host_config",
"libgflags",
