commit 316e6428ed8239dc1c403057c1fc01e52f672b84
author Cole Faust <colefaust@google.com> Tue Oct 22 16:31:03 2024 -0700
committer Cole Faust <colefaust@google.com> Tue Oct 22 16:56:02 2024 -0700
tree 4347a329484d0d8b9376cb1423473dfea50969c5
parent d7f32367a2e1f2391a75776712e85f1bb0c7fc93

Remove dependencies on the 1-variant fallback

When adding a dependencies, if the variants don't match, but the
dependency only has 1 variant anyways, soong will always use that
variant. This makes it hard to add new variants to soong, because the
1-variant fallback stops being used and you start getting missing
variant errors. Make changes to bp files such that all dependencies
correctly specify the variant to use.

Bug: 372091092
Flag: EXEMPT refactor
Test: m nothing
Change-Id: I0bd19892e7ad88d9259a3c2031e92b90ac530e1c

libs/vbmeta/Android.bp

diff --git a/libs/vbmeta/Android.bp b/libs/vbmeta/Android.bp
index 9a7375d..15c7b4a 100644
--- a/libs/vbmeta/Android.bp
+++ b/libs/vbmeta/Android.bp
@@ -31,7 +31,7 @@
         "libanyhow",
         "libtempfile",
     ],
-    data: [
+    device_common_data: [
         ":avb_testkey_rsa2048",
         ":avb_testkey_rsa4096",
         ":avb_testkey_rsa8192",