Merge "Disable rust prebuilts for darwin" am: 1f5b84c53b am: 6dbccdc841
am: b21a2c5404
Change-Id: I745babbe414efaecf242bf0cc11dfb2677308969
diff --git a/linux-x86/Android.bp b/linux-x86/Android.bp
index d10a401..3cd4eb4 100644
--- a/linux-x86/Android.bp
+++ b/linux-x86/Android.bp
@@ -3,12 +3,13 @@
stem: "libarena",
suffix: "-82bd32b7b1cc8097",
crate_name: "arena",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libarena-82bd32b7b1cc8097.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -17,12 +18,13 @@
stem: "libfmt_macros",
suffix: "-8550fdd443d21f4f",
crate_name: "fmt_macros",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libfmt_macros-8550fdd443d21f4f.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -31,12 +33,13 @@
stem: "libgraphviz",
suffix: "-0e6d9373f73b1f85",
crate_name: "grappviz",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgraphviz-0e6d9373f73b1f85.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -45,12 +48,13 @@
stem: "libserialize",
suffix: "-38112747f94a5a1f",
crate_name: "serialize",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libserialize-38112747f94a5a1f.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -59,12 +63,13 @@
stem: "libstd",
suffix: "-82e33bc21b9a2598",
crate_name: "std",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-82e33bc21b9a2598.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -73,12 +78,13 @@
stem: "libsyntax",
suffix: "-43bb704a9e1c5f3e",
crate_name: "syntax",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax-43bb704a9e1c5f3e.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -87,12 +93,13 @@
stem: "libsyntax_ext",
suffix: "-e1274c7611bed711",
crate_name: "syntax_ext",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_ext-e1274c7611bed711.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -101,12 +108,13 @@
stem: "libsyntax_pos",
suffix: "-c9173fad01cc2e7a",
crate_name: "syntax_pos",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_pos-c9173fad01cc2e7a.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -115,12 +123,13 @@
stem: "libterm",
suffix: "-a024e8bcf45cde32",
crate_name: "term",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm-a024e8bcf45cde32.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}
@@ -129,11 +138,12 @@
stem: "libtest",
suffix: "-9bbfd564b2eb298a",
crate_name: "test",
- arch: {
- x86_64: {
+ target: {
+ linux_glibc_x86_64: {
srcs: ["1.35.0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-9bbfd564b2eb298a.so"],
enabled: true,
},
},
+ enabled: false,
host_supported: true,
}