Generated files and java/BUILD changes to include them

project-chip · Jun 18, 2021 · 6437ffc · 6437ffc
1 parent 99f5b18
commit 6437ffc
Show file tree

Hide file tree

Showing 3 changed files with 14,289 additions and 0 deletions.
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -18,6 +18,13 @@ import("//build_overrides/chip.gni")
 import("${build_root}/config/android_abi.gni")
 import("${chip_root}/build/chip/java/rules.gni")
 
+config("java_config") {
+  include_dirs = [
+    ".",
+    "..",
+  ]
+}
+
 shared_library("jni") {
   output_name = "libCHIPController"
 
@@ -38,13 +45,17 @@ shared_library("jni") {
     "JniReferences.h",
     "JniTypeWrappers.h",
     "StackLock.h",
+    "gen/CHIPClusters-JNI.cpp",
   ]
 
   deps = [
+    "${chip_root}/src/app",
     "${chip_root}/src/controller/data_model",
     "${chip_root}/src/lib",
   ]
 
+  public_configs = [ ":java_config" ]
+
   output_dir = "${root_out_dir}/lib/jni/${android_abi}"
 }
 
@@ -57,6 +68,7 @@ android_library("java") {
   ]
 
   sources = [
+    "gen/ChipClusters.java",
     "src/chip/devicecontroller/AndroidChipStack.java",
     "src/chip/devicecontroller/ChipClusterException.java",
     "src/chip/devicecontroller/ChipCommandType.java",