From 3ed60cec02e9917141f3fb854ebf8edf9f351e8d Mon Sep 17 00:00:00 2001
From: kierancyphus <kierancyphus@google.com>
Date: Fri, 10 Nov 2023 14:40:18 +0800
Subject: [PATCH] dump_modemlog: move all files to subdirectory

Since radioext has already moved to this folder, it doesn't make sense
for the base folder to be dump_modemlog. This change moves it to its
own subfolder so that we can also add more in the future.

Test: build and flash, trigger bugreport and check modem logs are there
Bug: 302435001
Change-Id: Ia83378074068526023f591d63b1e5ac4700b8103
---
 modem/{ => dump_modemlog}/Android.bp             | 16 ++++++++--------
 modem/{ => dump_modemlog}/dump_modem.sh          |  0
 modem/{ => dump_modemlog}/dump_modemlog.cpp      | 13 ++++++-------
 modem/dump_modemlog/dump_modemlog.mk             |  5 +++++
 .../include/android_property_manager.h           |  7 +++----
 modem/{ => dump_modemlog}/include/dumper.h       |  7 +++----
 .../include/modem_log_constants.h                |  7 +++----
 .../include/modem_log_dumper.h                   |  6 ++----
 modem/{ => dump_modemlog}/modem_log_dumper.cpp   |  7 +++----
 .../modem_log_dumper_test.cpp                    |  7 +++----
 modem/{ => dump_modemlog}/sepolicy/dump_modem.te |  0
 .../sepolicy/dump_modemlog.te                    |  0
 modem/{ => dump_modemlog}/sepolicy/file.te       |  0
 modem/{ => dump_modemlog}/sepolicy/file_contexts |  0
 .../{ => dump_modemlog}/sepolicy/genfs_contexts  |  0
 .../test/include/fake_android_property_manager.h | 12 +++++-------
 modem/modem.mk                                   |  6 +-----
 17 files changed, 42 insertions(+), 51 deletions(-)
 rename modem/{ => dump_modemlog}/Android.bp (65%)
 rename modem/{ => dump_modemlog}/dump_modem.sh (100%)
 rename modem/{ => dump_modemlog}/dump_modemlog.cpp (89%)
 create mode 100644 modem/dump_modemlog/dump_modemlog.mk
 rename modem/{ => dump_modemlog}/include/android_property_manager.h (86%)
 rename modem/{ => dump_modemlog}/include/dumper.h (96%)
 rename modem/{ => dump_modemlog}/include/modem_log_constants.h (96%)
 rename modem/{ => dump_modemlog}/include/modem_log_dumper.h (96%)
 rename modem/{ => dump_modemlog}/modem_log_dumper.cpp (96%)
 rename modem/{test => dump_modemlog}/modem_log_dumper_test.cpp (97%)
 rename modem/{ => dump_modemlog}/sepolicy/dump_modem.te (100%)
 rename modem/{ => dump_modemlog}/sepolicy/dump_modemlog.te (100%)
 rename modem/{ => dump_modemlog}/sepolicy/file.te (100%)
 rename modem/{ => dump_modemlog}/sepolicy/file_contexts (100%)
 rename modem/{ => dump_modemlog}/sepolicy/genfs_contexts (100%)
 rename modem/{ => dump_modemlog}/test/include/fake_android_property_manager.h (91%)

diff --git a/modem/Android.bp b/modem/dump_modemlog/Android.bp
similarity index 65%
rename from modem/Android.bp
rename to modem/dump_modemlog/Android.bp
index dbc1cac..b264609 100644
--- a/modem/Android.bp
+++ b/modem/dump_modemlog/Android.bp
@@ -11,9 +11,9 @@ sh_binary {
 
 cc_defaults {
     name: "dump_modemlog_defaults",
-    srcs: ["modem_log_dumper.cpp"],
-    local_include_dirs: ["include"],
-    shared_libs: ["liblog"],
+    srcs: [ "modem_log_dumper.cpp" ],
+    local_include_dirs: [ "include" ],
+    shared_libs: [ "liblog" ],
 }
 
 cc_binary {
@@ -29,16 +29,16 @@ cc_binary {
         "libdump",
         "liblog",
     ],
-    defaults: ["dump_modemlog_defaults"],
+    defaults: [ "dump_modemlog_defaults" ],
     vendor: true,
     relative_install_path: "dump",
 }
 
 cc_test {
     name: "dump_modemlog_test",
-    srcs: ["test/*.cpp"],
-    defaults: ["dump_modemlog_defaults"],
-    local_include_dirs: ["test/include"],
-    static_libs: ["libgmock"],
+    srcs: [ "*_test.cpp" ],
+    defaults: [ "dump_modemlog_defaults" ],
+    local_include_dirs: [ "test/include" ],
+    static_libs: [ "libgmock" ],
     vendor: true,
 }
diff --git a/modem/dump_modem.sh b/modem/dump_modemlog/dump_modem.sh
similarity index 100%
rename from modem/dump_modem.sh
rename to modem/dump_modemlog/dump_modem.sh
diff --git a/modem/dump_modemlog.cpp b/modem/dump_modemlog/dump_modemlog.cpp
similarity index 89%
rename from modem/dump_modemlog.cpp
rename to modem/dump_modemlog/dump_modemlog.cpp
index 1b6b2e9..47181cb 100644
--- a/modem/dump_modemlog.cpp
+++ b/modem/dump_modemlog/dump_modemlog.cpp
@@ -19,8 +19,7 @@
 #include "dumper.h"
 #include "modem_log_dumper.h"
 
-namespace modem {
-namespace logging {
+namespace pixel_modem::logging {
 
 /**
  * @brief Implementation of AndroidPropertyManager that directly forwards to
@@ -59,13 +58,13 @@ class DumperImpl : public Dumper {
   }
 };
 
-}  // namespace logging
-}  // namespace modem
+}  // namespace pixel_modem::logging
 
 int main() {
-  modem::logging::DumperImpl dumper_impl;
-  modem::logging::AndroidPropertyManagerImpl android_property_manager_impl;
-  modem::logging::ModemLogDumper modem_log_dumper(
+  pixel_modem::logging::DumperImpl dumper_impl;
+  pixel_modem::logging::AndroidPropertyManagerImpl
+      android_property_manager_impl;
+  pixel_modem::logging::ModemLogDumper modem_log_dumper(
       dumper_impl, android_property_manager_impl);
 
   modem_log_dumper.DumpModemLogs();
diff --git a/modem/dump_modemlog/dump_modemlog.mk b/modem/dump_modemlog/dump_modemlog.mk
new file mode 100644
index 0000000..5e91ab7
--- /dev/null
+++ b/modem/dump_modemlog/dump_modemlog.mk
@@ -0,0 +1,5 @@
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/modem/dump_modemlog/sepolicy
+
+PRODUCT_PACKAGES += dump_modem.sh
+PRODUCT_PACKAGES += dump_modemlog
+
diff --git a/modem/include/android_property_manager.h b/modem/dump_modemlog/include/android_property_manager.h
similarity index 86%
rename from modem/include/android_property_manager.h
rename to modem/dump_modemlog/include/android_property_manager.h
index 7135d66..eb426c3 100644
--- a/modem/include/android_property_manager.h
+++ b/modem/dump_modemlog/include/android_property_manager.h
@@ -2,8 +2,7 @@
 
 #include <string>
 
-namespace modem {
-namespace logging {
+namespace pixel_modem::logging {
 
 /**
  * @brief Interface for interacting with Android System Properties.
@@ -17,5 +16,5 @@ class AndroidPropertyManager {
   virtual int GetIntProperty(const std::string& key, int default_value);
   virtual void SetProperty(const std::string& key, const std::string& value);
 };
-}  // namespace logging
-}  // namespace modem
+
+}  // namespace pixel_modem::logging
diff --git a/modem/include/dumper.h b/modem/dump_modemlog/include/dumper.h
similarity index 96%
rename from modem/include/dumper.h
rename to modem/dump_modemlog/include/dumper.h
index 348e666..a9b96c6 100644
--- a/modem/include/dumper.h
+++ b/modem/dump_modemlog/include/dumper.h
@@ -3,8 +3,7 @@
 #include <ostream>
 #include <string_view>
 
-namespace modem {
-namespace logging {
+namespace pixel_modem::logging {
 
 /**
  * @brief Data object for information about dumpings logs.
@@ -67,5 +66,5 @@ class Dumper {
   virtual void DumpLogs(const LogDumpInfo& log_dump_info);
   virtual void CopyFile(const FileCopyInfo& file_copy_info);
 };
-}  // namespace logging
-}  // namespace modem
+
+}  // namespace pixel_modem::logging
diff --git a/modem/include/modem_log_constants.h b/modem/dump_modemlog/include/modem_log_constants.h
similarity index 96%
rename from modem/include/modem_log_constants.h
rename to modem/dump_modemlog/include/modem_log_constants.h
index 29a0fa8..8183ec3 100644
--- a/modem/include/modem_log_constants.h
+++ b/modem/dump_modemlog/include/modem_log_constants.h
@@ -3,8 +3,7 @@
 
 #include "dumper.h"
 
-namespace modem {
-namespace logging {
+namespace pixel_modem::logging {
 
 // Modem related Android System Properties
 
@@ -52,5 +51,5 @@ constexpr static FileCopyInfo kFileCopyInfo[] = {
     {.src_dir = "/mnt/vendor/efs/nv_protected.bin",
      .dest_dir =
          "/data/vendor/radio/logs/always-on/all_logs/nv_protected.bin"}};
-}  // namespace logging
-}  // namespace modem
+
+}  // namespace pixel_modem::logging
diff --git a/modem/include/modem_log_dumper.h b/modem/dump_modemlog/include/modem_log_dumper.h
similarity index 96%
rename from modem/include/modem_log_dumper.h
rename to modem/dump_modemlog/include/modem_log_dumper.h
index 96911b0..1533217 100644
--- a/modem/include/modem_log_dumper.h
+++ b/modem/dump_modemlog/include/modem_log_dumper.h
@@ -3,8 +3,7 @@
 #include "android_property_manager.h"
 #include "dumper.h"
 
-namespace modem {
-namespace logging {
+namespace pixel_modem::logging {
 
 /**
  * @brief Responsible for dumping all relevant modem logs.
@@ -77,5 +76,4 @@ class ModemLogDumper {
   AndroidPropertyManager& android_property_manager_;
 };
 
-}  // namespace logging
-}  // namespace modem
+}  // namespace pixel_modem::logging
diff --git a/modem/modem_log_dumper.cpp b/modem/dump_modemlog/modem_log_dumper.cpp
similarity index 96%
rename from modem/modem_log_dumper.cpp
rename to modem/dump_modemlog/modem_log_dumper.cpp
index fad8d29..b5e7a07 100644
--- a/modem/modem_log_dumper.cpp
+++ b/modem/dump_modemlog/modem_log_dumper.cpp
@@ -5,8 +5,7 @@
 #include "dumper.h"
 #include "modem_log_constants.h"
 
-namespace modem {
-namespace logging {
+namespace pixel_modem::logging {
 
 void ModemLogDumper::DumpModemLogs() {
   bool shouldRestartModemLogging =
@@ -76,5 +75,5 @@ void ModemLogDumper::startModemLogging() {
   android_property_manager_.SetProperty(kModemLoggingEnabledProperty.data(),
                                         "true");
 }
-}  // namespace logging
-}  // namespace modem
+
+}  // namespace pixel_modem::logging
diff --git a/modem/test/modem_log_dumper_test.cpp b/modem/dump_modemlog/modem_log_dumper_test.cpp
similarity index 97%
rename from modem/test/modem_log_dumper_test.cpp
rename to modem/dump_modemlog/modem_log_dumper_test.cpp
index a052d43..d9917e1 100644
--- a/modem/test/modem_log_dumper_test.cpp
+++ b/modem/dump_modemlog/modem_log_dumper_test.cpp
@@ -7,8 +7,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-namespace modem {
-namespace logging {
+namespace pixel_modem::logging {
 namespace {
 
 using ::testing::Eq;
@@ -101,6 +100,6 @@ TEST_F(ModemLogDumperTest,
 
   EXPECT_FALSE(fake_android_property_manager.ModemLoggingHasRestarted());
 }
+
 }  // namespace
-}  // namespace logging
-}  // namespace modem
+}  // namespace pixel_modem::logging
diff --git a/modem/sepolicy/dump_modem.te b/modem/dump_modemlog/sepolicy/dump_modem.te
similarity index 100%
rename from modem/sepolicy/dump_modem.te
rename to modem/dump_modemlog/sepolicy/dump_modem.te
diff --git a/modem/sepolicy/dump_modemlog.te b/modem/dump_modemlog/sepolicy/dump_modemlog.te
similarity index 100%
rename from modem/sepolicy/dump_modemlog.te
rename to modem/dump_modemlog/sepolicy/dump_modemlog.te
diff --git a/modem/sepolicy/file.te b/modem/dump_modemlog/sepolicy/file.te
similarity index 100%
rename from modem/sepolicy/file.te
rename to modem/dump_modemlog/sepolicy/file.te
diff --git a/modem/sepolicy/file_contexts b/modem/dump_modemlog/sepolicy/file_contexts
similarity index 100%
rename from modem/sepolicy/file_contexts
rename to modem/dump_modemlog/sepolicy/file_contexts
diff --git a/modem/sepolicy/genfs_contexts b/modem/dump_modemlog/sepolicy/genfs_contexts
similarity index 100%
rename from modem/sepolicy/genfs_contexts
rename to modem/dump_modemlog/sepolicy/genfs_contexts
diff --git a/modem/test/include/fake_android_property_manager.h b/modem/dump_modemlog/test/include/fake_android_property_manager.h
similarity index 91%
rename from modem/test/include/fake_android_property_manager.h
rename to modem/dump_modemlog/test/include/fake_android_property_manager.h
index 79fd4f1..0d5731a 100644
--- a/modem/test/include/fake_android_property_manager.h
+++ b/modem/dump_modemlog/test/include/fake_android_property_manager.h
@@ -7,8 +7,7 @@
 #include "android_property_manager.h"
 #include "modem_log_constants.h"
 
-namespace modem {
-namespace logging {
+namespace pixel_modem::logging {
 
 /**
  * @brief Fake Implementation of AndroidPropertyManager that mocks some of the
@@ -20,9 +19,8 @@ class FakeAndroidPropertyManager : public AndroidPropertyManager {
   inline constexpr static std::string_view kFalseString = "false";
 
   bool GetBoolProperty(const std::string& key, bool default_value) override {
-    return MapContainsKey(key)
-               ? GetPropertyInternal(key) == kTruthString
-               : default_value;
+    return MapContainsKey(key) ? GetPropertyInternal(key) == kTruthString
+                               : default_value;
   };
 
   std::string GetProperty(const std::string& key,
@@ -73,5 +71,5 @@ class FakeAndroidPropertyManager : public AndroidPropertyManager {
   bool modem_logging_has_been_off_ = false;
   bool modem_logging_has_restarted_ = false;
 };
-}  // namespace logging
-}  // namespace modem
+
+}  // namespace pixel_modem::logging
diff --git a/modem/modem.mk b/modem/modem.mk
index 10df7d4..d921e74 100644
--- a/modem/modem.mk
+++ b/modem/modem.mk
@@ -1,5 +1 @@
-BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/modem/sepolicy
-
-PRODUCT_PACKAGES += dump_modem.sh
-PRODUCT_PACKAGES += dump_modemlog
-
+include device/google/gs-common/modem/dump_modemlog/dump_modemlog.mk