[Android] Add 'matter_enable_tlv_decoder_api' (project-chip#28977)

* Divide android build feature * restyle
kurvaSai · Sep 22, 2023 · 6612760 · 6612760
1 parent 59d2b7e
commit 6612760
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/build/chip/java/config.gni b/build/chip/java/config.gni
@@ -18,6 +18,11 @@ declare_args() {
 
   # The class of each cluster created by ZAP is added to the library. (e.g., ChipClusters)
   matter_enable_java_generated_api = true
+
+  # The API of TLV decoder created by ZAP is added to the library.
+  # If the 'matter_enable_java_generated_api' feature is enabled, this feature must be enabled.
+  matter_enable_tlv_decoder_api = true
+
   matter_enable_java_compilation = false
   if (java_path != "" && current_os == "linux") {
     java_matter_controller_dependent_paths += [ "${java_path}/include/" ]
@@ -31,6 +36,7 @@ declare_args() {
     }
 
     matter_enable_java_generated_api = false
+    matter_enable_tlv_decoder_api = false
     matter_enable_java_compilation = true
   }
 }
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -71,16 +71,21 @@ shared_library("jni") {
     "${chip_root}/src/platform",
   ]
 
-  if (matter_enable_java_generated_api) {
+  if (matter_enable_tlv_decoder_api) {
     defines += [ "USE_JAVA_TLV_ENCODE_DECODE" ]
 
     sources += [
-      "CHIPDefaultCallbacks.cpp",
-      "CHIPDefaultCallbacks.h",
       "CHIPTLVValueDecoder-JNI.cpp",
       "zap-generated/CHIPAttributeTLVValueDecoder.cpp",
-      "zap-generated/CHIPClustersWrite-JNI.cpp",
       "zap-generated/CHIPEventTLVValueDecoder.cpp",
+    ]
+  }
+
+  if (matter_enable_java_generated_api) {
+    sources += [
+      "CHIPDefaultCallbacks.cpp",
+      "CHIPDefaultCallbacks.h",
+      "zap-generated/CHIPClustersWrite-JNI.cpp",
       "zap-generated/CHIPInvokeCallbacks.cpp",
       "zap-generated/CHIPInvokeCallbacks.h",
       "zap-generated/CHIPReadCallbacks.cpp",
@@ -426,6 +431,10 @@ android_library("java") {
     "src/chip/devicecontroller/model/NodeState.java",
   ]
 
+  if (matter_enable_tlv_decoder_api) {
+    sources += [ "src/chip/devicecontroller/ChipTLVValueDecoder.java" ]
+  }
+
   if (matter_enable_java_generated_api) {
     sources += [
       "generated/java/chip/devicecontroller/ClusterReadMapping.java",
@@ -436,7 +445,6 @@ android_library("java") {
       "src/chip/clusterinfo/CommandResponseInfo.java",
       "src/chip/clusterinfo/DelegatedClusterCallback.java",
       "src/chip/clusterinfo/InteractionInfo.java",
-      "src/chip/devicecontroller/ChipTLVValueDecoder.java",
       "zap-generated/chip/devicecontroller/ChipClusters.java",
       "zap-generated/chip/devicecontroller/ChipEventStructs.java",
       "zap-generated/chip/devicecontroller/ChipStructs.java",