From cfa4fe7e2b395589b950e695f0d176472776da91 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Mon, 28 Oct 2024 12:20:53 -0700
Subject: [PATCH] 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: Ifa43c0488e4cd40d6195fe2af3de5faa4f5996ea
---
 Android.bp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 9d7aa73a8f..223e2c2987 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,6 +66,8 @@ filegroup {
     srcs: [
         "quickstep/src/**/*.kt",
         "quickstep/src/**/*.java",
+    ],
+    device_common_srcs: [
         ":launcher-quickstep-processed-protolog-src",
     ],
 }
@@ -90,7 +92,7 @@ java_library {
     ],
 }
 
-genrule {
+java_genrule {
     name: "launcher-quickstep-processed-protolog-src",
     srcs: [
         ":protolog-impl",
@@ -108,7 +110,7 @@ genrule {
     out: ["launcher.quickstep.protolog.srcjar"],
 }
 
-genrule {
+java_genrule {
     name: "gen-launcher.quickstep.protolog.pb",
     srcs: [
         ":launcher-quickstep-unprocessed-protolog-src",