Move android's Logging.cpp to src/platform/android/ (#34192)

Previously, it was placed in src/platform/logging/impl/android/
SiliconLabsSoftware · Jul 5, 2024 · fc52c4a · fc52c4a
1 parent 82b1e1b
commit fc52c4a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/examples/android/CHIPTest/BUILD.gn b/examples/android/CHIPTest/BUILD.gn
@@ -37,7 +37,7 @@ shared_library("jni") {
     "${chip_root}/src/platform",
     "${chip_root}/src/platform/android",
     "${chip_root}/src/platform/android:java",
-    "${chip_root}/src/platform/logging:android",
+    "${chip_root}/src/platform/android:logging",
     "${chip_root}/src/platform/tests:tests",
     "${chip_root}/third_party/inipp",
     "${chip_root}/third_party/nlfaultinjection:nlfaultinjection",

diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
@@ -299,7 +299,7 @@ static_library("support") {
 
   # Android has no 'platform' that provides logging
   if (current_os == "android") {
-    public_deps += [ "${chip_root}/src/platform/logging:android" ]
+    public_deps += [ "${chip_root}/src/platform/android:logging" ]
   }
 
   if (current_os == "mac" || current_os == "ios") {

diff --git a/src/platform/android/BUILD.gn b/src/platform/android/BUILD.gn
@@ -36,6 +36,19 @@ source_set("tracing") {
   ]
 }
 
+static_library("logging") {
+  sources = [ "Logging.cpp" ]
+  deps = [
+    "${chip_root}/src/lib/core:chip_config_header",
+    "${chip_root}/src/lib/support:attributes",
+    "${chip_root}/src/lib/support:logging_constants",
+    "${chip_root}/src/platform:platform_config_header",
+    "${chip_root}/src/platform/logging:headers",
+  ]
+
+  libs = [ "log" ]
+}
+
 static_library("android") {
   output_name = "libAndroidPlatform"
 

diff --git a/...platform/logging/impl/android/Logging.cpp → src/platform/android/Logging.cpp b/...platform/logging/impl/android/Logging.cpp → src/platform/android/Logging.cpp
diff --git a/src/platform/logging/BUILD.gn b/src/platform/logging/BUILD.gn
@@ -87,22 +87,6 @@ source_set("headers") {
   public = [ "LogV.h" ]
 }
 
-if (current_os == "android") {
-  static_library("android") {
-    sources = [ "impl/android/Logging.cpp" ]
-    deps = [
-      ":headers",
-      "${chip_root}/src/lib/core:chip_config_header",
-      "${chip_root}/src/lib/support:attributes",
-      "${chip_root}/src/lib/support:logging_constants",
-      "${chip_root}/src/platform:platform_config_header",
-      "${chip_root}/src/platform/logging:headers",
-    ]
-
-    libs = [ "log" ]
-  }
-}
-
 # We need to reference the output file of ":stdio" at build time,
 # but get_target_outputs() does not work for binary targets. As a
 # workaround, define a reasonable path and make the target use it.