Loading CHIPController manually from MatterEndpoint.java

Author: sharadb-amazon

examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/CastingApp.java

@@ -158,8 +158,6 @@ public MatterError stop() {
   private native MatterError finishStartup();
 
   static {
-    //System.loadLibrary("CHIPController");
-    //System.out.println("CHIPController loaded");
     System.loadLibrary("TvCastingApp");
     System.out.println("TvCastingApp loaded");
   }

examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterEndpoint.java

@@ -91,7 +91,13 @@ public void testGetCluster()
     try {
       Long deviceProxy = deviceProxyFuture.get(5, TimeUnit.SECONDS);
       Log.d(TAG, "getDeviceProxy returned value " + deviceProxy);
+
+      System.out.println("CHIPController loading");
+      System.loadLibrary("CHIPController");
+      System.out.println("CHIPController loaded");
+
       ChipClusters.ContentLauncherCluster cluster = new ChipClusters.ContentLauncherCluster(deviceProxy, getId());
+      Log.d(TAG, "Content launcher cluster created " + cluster);
       cluster.launchURL(new ChipClusters.ContentLauncherCluster.LauncherResponseCallback() {
         @Override
         public void onSuccess(Integer status, Optional<String> data) {

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

@@ -81,6 +81,7 @@ android_library("java") {
     ":android",
     "${chip_root}/src/app/server/java",
     "${chip_root}/src/controller/java",
+    "${chip_root}/src/controller/java:java",
     "${chip_root}/src/platform/android:java",
     "${chip_root}/third_party/android_deps:annotation",
   ]
@@ -153,6 +154,7 @@ group("default") {
     ":jni",
     "${chip_root}/src/app/server/java",
     "${chip_root}/src/controller/java",
+    "${chip_root}/src/controller/java:java",
     "${chip_root}/src/platform/android:java",
   ]
 }