Replace custom config in java/BUILD with src:includes (#7801)

project-chip · Jun 29, 2021 · 8d989e1 · 8d989e1
1 parent bd4e9bc
commit 8d989e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -18,13 +18,6 @@ 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"
 
@@ -49,12 +42,11 @@ shared_library("jni") {
   ]
 
   deps = [
-    "${chip_root}/src/app",
     "${chip_root}/src/controller/data_model",
     "${chip_root}/src/lib",
   ]
 
-  public_configs = [ ":java_config" ]
+  public_configs = [ "${chip_root}/src:includes" ]
 
   output_dir = "${root_out_dir}/lib/jni/${android_abi}"
 }

diff --git a/src/controller/java/gen/CHIPClusters-JNI.cpp b/src/controller/java/gen/CHIPClusters-JNI.cpp
@@ -17,13 +17,13 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-#include "CHIPJNIError.h"
-#include "JniReferences.h"
-#include "JniTypeWrappers.h"
-#include "StackLock.h"
 #include "gen/CHIPClientCallbacks.h"
 #include "gen/CHIPClusters.h"
 
+#include <controller/java/CHIPJNIError.h>
+#include <controller/java/JniReferences.h>
+#include <controller/java/JniTypeWrappers.h>
+#include <controller/java/StackLock.h>
 #include <core/CHIPSafeCasts.h>
 #include <jni.h>
 #include <lib/support/Span.h>

diff --git a/src/controller/java/templates/CHIPClusters-JNI.zapt b/src/controller/java/templates/CHIPClusters-JNI.zapt
@@ -1,13 +1,13 @@
 {{> header}}
 {{#if (chip_has_client_clusters)}}
 
-#include "CHIPJNIError.h"
 #include "gen/CHIPClusters.h"
 #include "gen/CHIPClientCallbacks.h"
-#include "JniReferences.h"
-#include "JniTypeWrappers.h"
-#include "StackLock.h"
 
+#include <controller/java/CHIPJNIError.h>
+#include <controller/java/JniReferences.h>
+#include <controller/java/JniTypeWrappers.h>
+#include <controller/java/StackLock.h>
 #include <core/CHIPSafeCasts.h>
 #include <lib/support/Span.h>
 #include <jni.h>