From e8aa990cd371b255ef04e3d71c02459b629d8201 Mon Sep 17 00:00:00 2001
From: Yufeng Wang <yufengwang@google.com>
Date: Wed, 9 Nov 2022 13:30:01 -0800
Subject: [PATCH] Use java_binary instead of android_binary to build
 java-matter-controller (#23562)

---
 build/chip/java/rules.gni                | 4 ++++
 examples/java-matter-controller/BUILD.gn | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/chip/java/rules.gni b/build/chip/java/rules.gni
index 166050f27f56db..c8518303f121dd 100644
--- a/build/chip/java/rules.gni
+++ b/build/chip/java/rules.gni
@@ -28,6 +28,8 @@ assert(android_sdk_root != "", "android_sdk_root must be specified")
 #
 #   jar_path: A path to an existing JAR. Mutually exclusive with sources.
 #
+#   deps: List of dependent .jar files needed by this library.
+#
 #   output_name: File name for the output .jar (not including extension).
 #     Defaults to the input .jar file name.
 #
@@ -184,6 +186,8 @@ template("java_library") {
 #
 #   jar_path: A path to an existing JAR. Mutually exclusive with sources.
 #
+#   deps: List of dependent .jar files needed by this binary.
+#
 #   output_name: File name for the output binary under root_build_dir/bin.
 #
 #   javac_flags: additional flags to pass to the javac compiler
diff --git a/examples/java-matter-controller/BUILD.gn b/examples/java-matter-controller/BUILD.gn
index 7c8bdf2f857144..71a44aaa2688cf 100644
--- a/examples/java-matter-controller/BUILD.gn
+++ b/examples/java-matter-controller/BUILD.gn
@@ -21,7 +21,7 @@ import("${chip_root}/build/chip/tools.gni")
 
 build_java_matter_controller = true
 
-android_binary("java-matter-controller") {
+java_binary("java-matter-controller") {
   output_name = "java-matter-controller"
   deps = [
     "${chip_root}/src/controller/java",