vmbase: Use aarch64 specific libs conditionally
This commit add separate section in Build script that
provide ARM specific dependencies.
This code is part of bigger refactoring before adding new CPU architecture,
Bug: 362733888
Test: m libvmbase
Change-Id: I164d0e3b266e56a3aa665402811ea8fbcf333dbd
diff --git a/libs/libvmbase/Android.bp b/libs/libvmbase/Android.bp
index 7465508..c54f859 100644
--- a/libs/libvmbase/Android.bp
+++ b/libs/libvmbase/Android.bp
@@ -77,14 +77,12 @@
crate_name: "vmbase",
srcs: ["src/lib.rs"],
rustlibs: [
- "libaarch64_paging",
"libbuddy_system_allocator",
"libcfg_if",
"libhypervisor_backends",
"liblibfdt_nostd",
"liblog_rust_nostd",
"libonce_cell_nostd",
- "libsmccc",
"libspin_nostd",
"libstatic_assertions",
"libthiserror_nostd",
@@ -97,11 +95,19 @@
whole_static_libs: [
"librust_baremetal",
],
- // TODO(b/277859415, b/277860860): Drop "compat_android_13".
- features: [
- "compat_android_13",
- "cpu_feat_hafdbs",
- ],
+ target: {
+ android_arm64: {
+ rustlibs: [
+ "libaarch64_paging",
+ "libsmccc",
+ ],
+ // TODO(b/277859415, b/277860860): Drop "compat_android_13".
+ features: [
+ "compat_android_13",
+ "cpu_feat_hafdbs",
+ ],
+ },
+ },
}
cc_library_static {