Switching from ifdef to if

sharadb-amazon · sharadb-amazon · commit c7ca69e8e651 · 2024-02-21T15:10:51.000-08:00
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -98,6 +98,8 @@ shared_library("jni") {
     ]
 
     deps += [ "${chip_root}/src/controller:nodatamodel" ]
+  } else {
+    defines += [ "CHIP_DEVICE_CONFIG_DYNAMIC_SERVER=0" ]
   }
 
   if (matter_enable_java_compilation) {
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -58,7 +58,7 @@
 #include <system/SystemClock.h>
 #include <vector>
 
-#ifdef CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
+#if CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
 #include <app/dynamic_server/AccessControl.h>
 #endif // CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
 
@@ -147,7 +147,7 @@ jint JNI_OnLoad(JavaVM * jvm, void * reserved)
     SuccessOrExit(err);
 #endif // JAVA_MATTER_CONTROLLER_TEST
 
-#ifdef CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
+#if CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
     chip::app::dynamic_server::InitAccessControl();
 #endif // CHIP_DEVICE_CONFIG_DYNAMIC_SERVER
 

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,8 @@ shared_library("jni") {`
`98`	`98`	`]`
`99`	`99`
`100`	`100`	`deps += [ "${chip_root}/src/controller:nodatamodel" ]`
	`101`	`+ } else {`
	`102`	`+ defines += [ "CHIP_DEVICE_CONFIG_DYNAMIC_SERVER=0" ]`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`if (matter_enable_java_compilation) {`