commit 4a26fe8119809496f2a46aa6d89d86e3b4c7e080
author Colin Cross <ccross@android.com> Thu Mar 17 13:14:55 2022 -0700
committer Colin Cross <ccross@android.com> Thu Mar 24 17:44:40 2022 +0000
tree 636895edafdd26dbe3755cc2e08675d924af2bf4
parent 919194578b25b947403c0cafc18bbbfef15eab14

Add kotlin-annotations to WindowManager-Shell

Soong normally adds kotlin-annotations as a dependency to any module
that uses kotlin sources, but it can't find the kotlin sources in
WindowManager-Shell because they are all in a filegroup.  Add it
manually as a workaround.

Bug: 225013372
Test: m checkbuild
Change-Id: I3b61702b13ae72d4cb20620dfbf9707f4b8aaaaa

libs/WindowManager/Shell/Android.bp

diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp
index cdff585..9d625c0 100644
--- a/libs/WindowManager/Shell/Android.bp
+++ b/libs/WindowManager/Shell/Android.bp
@@ -138,6 +138,11 @@
         "dagger2",
         "jsr330",
     ],
+    libs: [
+        // Soong fails to automatically add this dependency because all the
+        // *.kt sources are inside a filegroup.
+        "kotlin-annotations",
+    ],
     kotlincflags: ["-Xjvm-default=enable"],
     manifest: "AndroidManifest.xml",
     plugins: ["dagger2-compiler"],