commit d7aea45d55518b75220928123d223db033f67856
author Alan Stokes <alanstokes@google.com> Thu Mar 14 14:20:04 2024 +0000
committer Alan Stokes <alanstokes@google.com> Thu Mar 14 14:20:04 2024 +0000
tree 0fbc112d71667c8678751a5d183235f7209fc7f9
parent d973221b190828322115f51a9307ceb6aa70869e

Don't use *.rs for srcs

Rust build rules only support a single source file (which can then
reference other modules).

So avoid wildcards, and instead name the top-level file.

The only case where we had multiple sources was pvmfw/avb, which
actually seemed to be working fine.

Test: atest liblibfdt.integration_test libpvmfw_avb.integration_test
  libdiced_open_dice.integration_test libdiced_open_dice_nostd.integration_test
  libdiced_sample_inputs.integration_test libdiced_sample_inputs_nostd.integration_test
  libservice_vm_comm.test libservice_vm_comm_nostd.test
Change-Id: I64ec1829a2128eeb629b37715ab78f1b694b25e2

libs/dice/open_dice/Android.bp

diff --git a/libs/dice/open_dice/Android.bp b/libs/dice/open_dice/Android.bp
index ecc40f7..ab3220e 100644
--- a/libs/dice/open_dice/Android.bp
+++ b/libs/dice/open_dice/Android.bp
@@ -72,7 +72,7 @@
 rust_defaults {
     name: "libdiced_open_dice_test_defaults",
     crate_name: "diced_open_dice_test",
-    srcs: ["tests/*.rs"],
+    srcs: ["tests/api_test.rs"],
     test_suites: ["general-tests"],
 }
 

libs/dice/sample_inputs/Android.bp

diff --git a/libs/dice/sample_inputs/Android.bp b/libs/dice/sample_inputs/Android.bp
index 013038c..36fe8c7 100644
--- a/libs/dice/sample_inputs/Android.bp
+++ b/libs/dice/sample_inputs/Android.bp
@@ -54,7 +54,7 @@
 rust_defaults {
     name: "libdiced_sample_inputs_test_defaults",
     crate_name: "diced_sample_inputs_test",
-    srcs: ["tests/*.rs"],
+    srcs: ["tests/api_test.rs"],
     test_suites: ["general-tests"],
     rustlibs: [
         "libanyhow",

libs/libfdt/Android.bp

diff --git a/libs/libfdt/Android.bp b/libs/libfdt/Android.bp
index 1bb5692..7a7d71f 100644
--- a/libs/libfdt/Android.bp
+++ b/libs/libfdt/Android.bp
@@ -53,7 +53,7 @@
     name: "liblibfdt.integration_test",
     crate_name: "libfdt_test",
     defaults: ["avf_build_flags_rust"],
-    srcs: ["tests/*.rs"],
+    srcs: ["tests/api_test.rs"],
     test_suites: ["general-tests"],
     data: [
         ":fdt_test_tree_one_memory_range_dtb",

pvmfw/avb/Android.bp

diff --git a/pvmfw/avb/Android.bp b/pvmfw/avb/Android.bp
index 6101a0c..558152d 100644
--- a/pvmfw/avb/Android.bp
+++ b/pvmfw/avb/Android.bp
@@ -25,7 +25,7 @@
     name: "libpvmfw_avb.integration_test",
     crate_name: "pvmfw_avb_test",
     defaults: ["avf_build_flags_rust"],
-    srcs: ["tests/*.rs"],
+    srcs: ["tests/api_test.rs"],
     test_suites: ["general-tests"],
     data: [
         ":avb_testkey_rsa2048_pub_bin",

service_vm/comm/Android.bp

diff --git a/service_vm/comm/Android.bp b/service_vm/comm/Android.bp
index bf923a4..15b4ef8 100644
--- a/service_vm/comm/Android.bp
+++ b/service_vm/comm/Android.bp
@@ -50,7 +50,7 @@
 rust_defaults {
     name: "libservice_vm_comm_test_defaults",
     crate_name: "diced_open_dice_test",
-    srcs: ["tests/*.rs"],
+    srcs: ["tests/api_test.rs"],
     test_suites: ["general-tests"],
     prefer_rlib: true,
     rustlibs: [