Taking deps on all of controller and adding CHIPCluster*.jar

Author: sharadb-amazon

examples/tv-casting-app/android/BUILD.gn

@@ -53,7 +53,7 @@ shared_library("jni") {
   deps = [
     "${chip_root}/examples/tv-casting-app/tv-casting-common",
     "${chip_root}/src/app/server/java:jni",
-    "${chip_root}/src/controller/java:jni",
+    "${chip_root}/src/controller/java",
     "${chip_root}/src/lib",
     "${chip_root}/third_party/inipp",
   ]
@@ -71,7 +71,7 @@ android_library("java") {
   deps = [
     ":android",
     "${chip_root}/src/app/server/java",
-    "${chip_root}/src/controller/java:java",
+    "${chip_root}/src/controller/java",
     "${chip_root}/src/platform/android:java",
     "${chip_root}/third_party/android_deps:annotation",
   ]
@@ -134,8 +134,7 @@ group("default") {
     ":java",
     ":jni",
     "${chip_root}/src/app/server/java",
-    "${chip_root}/src/controller/java:java",
-    "${chip_root}/src/controller/java:jni",
+    "${chip_root}/src/controller/java",
     "${chip_root}/src/platform/android:java",
   ]
 }

scripts/build/builders/android.py

@@ -470,6 +470,9 @@ def _build(self):
                 jars = {
                     "AndroidPlatform.jar": "third_party/connectedhomeip/src/platform/android/AndroidPlatform.jar",
                     "CHIPAppServer.jar": "third_party/connectedhomeip/src/app/server/java/CHIPAppServer.jar",
+                    "CHIPController.jar": "third_party/connectedhomeip/src/controller/java/CHIPController.jar",
+                    "CHIPClusters.jar": "third_party/connectedhomeip/src/controller/java/CHIPClusters.jar",
+                    "CHIPClusterID.jar": "third_party/connectedhomeip/src/controller/java/CHIPClusterID.jar",
                     "TvCastingApp.jar": "TvCastingApp.jar",
                 }