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.
Test: make dist
Bug: 74073528
Change-Id: I692d333ce6b5b124e184e9c609ae82a8c0b791a0
diff --git a/Android.bp b/Android.bp
index 95707b6..a1c05ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,13 +42,10 @@
"cuttlefish_kernel_headers",
],
target: {
- linux: {
+ host: {
host_ldlibs: ["-lrt"],
cflags: ["-DCUTTLEFISH_HOST"],
- },
- // We don't need 32 bit host-side builds
- linux_x86: {
- enabled: false,
+ compile_multilib: "64",
},
// We don't need Darwin host-side builds
darwin: {
@@ -113,7 +110,7 @@
"liblog",
],
target: {
- linux: {
+ host: {
srcs: [
"host/vsoc/lib/gralloc_buffer_region_view.cpp",
"host/vsoc/lib/host_lock.cpp",