mbtool: Organize source files into more logical structure

Signed-off-by: Andrew Gunnerson <[email protected]>

mbbootui/daemon_connection.cpp

@@ -29,14 +29,14 @@
 #include "mbutil/socket.h"
 
 // Hackish, but gets the job done
-#include "../mbtool/protocol/mb_get_booted_rom_id_generated.h"
-#include "../mbtool/protocol/mb_get_installed_roms_generated.h"
-#include "../mbtool/protocol/mb_get_version_generated.h"
-#include "../mbtool/protocol/mb_switch_rom_generated.h"
-#include "../mbtool/protocol/reboot_generated.h"
-#include "../mbtool/protocol/shutdown_generated.h"
-#include "../mbtool/protocol/request_generated.h"
-#include "../mbtool/protocol/response_generated.h"
+#include "../mbtool/include/protocol/mb_get_booted_rom_id_generated.h"
+#include "../mbtool/include/protocol/mb_get_installed_roms_generated.h"
+#include "../mbtool/include/protocol/mb_get_version_generated.h"
+#include "../mbtool/include/protocol/mb_switch_rom_generated.h"
+#include "../mbtool/include/protocol/reboot_generated.h"
+#include "../mbtool/include/protocol/shutdown_generated.h"
+#include "../mbtool/include/protocol/request_generated.h"
+#include "../mbtool/include/protocol/response_generated.h"
 
 #define LOG_TAG "mbbootui/daemon_connection"
 

mbtool/CMakeLists.txt

@@ -1,36 +1,36 @@
 set_source_files_properties(
-    daemon_v3.cpp
+    src/boot/audit/libaudit.cpp
     PROPERTIES
     COMPILE_FLAGS
-    "-Wno-missing-declarations"
+    "-Wno-cast-align -Wno-conversion -Wno-gnu-statement-expression -Wno-old-style-cast -Wno-shorten-64-to-32 -Wno-sign-conversion"
 )
 
 set_source_files_properties(
-    packages.cpp
+    src/boot/auditd.cpp
     PROPERTIES
     COMPILE_FLAGS
-    "-Wno-format-nonliteral"
+    "-Wno-gnu-statement-expression -Wno-zero-length-array"
 )
 
 set_source_files_properties(
-    sepolpatch.cpp
+    src/boot/daemon_v3.cpp
     PROPERTIES
     COMPILE_FLAGS
-    "-Wno-keyword-macro"
+    "-Wno-missing-declarations"
 )
 
 set_source_files_properties(
-    auditd.cpp
+    src/boot/packages.cpp
     PROPERTIES
     COMPILE_FLAGS
-    "-Wno-gnu-statement-expression -Wno-zero-length-array"
+    "-Wno-format-nonliteral"
 )
 
 set_source_files_properties(
-    external/audit/libaudit.cpp
+    src/boot/property_service.cpp
     PROPERTIES
     COMPILE_FLAGS
-    "-Wno-cast-align -Wno-conversion -Wno-gnu-statement-expression -Wno-old-style-cast -Wno-shorten-64-to-32 -Wno-sign-conversion"
+    "-Wno-gnu-statement-expression -Wno-shorten-64-to-32 -Wno-sign-conversion"
 )
 
 set_source_files_properties(
@@ -41,10 +41,10 @@ set_source_files_properties(
 )
 
 set_source_files_properties(
-    src/util/property_service.cpp
+    src/util/sepolpatch.cpp
     PROPERTIES
     COMPILE_FLAGS
-    "-Wno-gnu-statement-expression -Wno-shorten-64-to-32 -Wno-sign-conversion"
+    "-Wno-keyword-macro"
 )
 
 set_source_files_properties(
@@ -57,73 +57,69 @@ set_source_files_properties(
 if(${MBP_BUILD_TARGET} STREQUAL android-system)
     # Generate validcerts.cpp
     configure_file(
-        ${CMAKE_CURRENT_SOURCE_DIR}/validcerts.cpp.in
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/util/validcerts.cpp.in
         ${CMAKE_CURRENT_BINARY_DIR}/gen/validcerts.cpp
     )
 
-    add_executable(
-        mbtool
-        appsync.cpp
-        appsyncmanager.cpp
-        auditd.cpp
-        daemon.cpp
-        daemon_v3.cpp
-        emergency.cpp
-        init.cpp
-        main.cpp
-        mount_fstab.cpp
-        multiboot.cpp
-        packages.cpp
-        properties.cpp
-        reboot.cpp
-        romconfig.cpp
-        roms.cpp
-        sepolpatch.cpp
-        signature.cpp
-        switcher.cpp
-        uevent_dump.cpp
-        wipe.cpp
-        external/audit/libaudit.cpp
-        src/initwrapper/cutils/uevent.cpp
-        src/initwrapper/devices.cpp
-        src/initwrapper/uevent_listener.cpp
+    add_library(
+        mbtool-util
+        STATIC
         src/util/legacy_property_service.cpp
-        src/util/property_service.cpp
-        src/util/uevent_thread.cpp
+        src/util/multiboot.cpp
+        src/util/romconfig.cpp
+        src/util/roms.cpp
+        src/util/sepolpatch.cpp
+        src/util/signature.cpp
+        src/util/switcher.cpp
+        src/util/wipe.cpp
         ${CMAKE_CURRENT_BINARY_DIR}/gen/validcerts.cpp
+    )
+
+    add_executable(
+        mbtool
+        src/boot/appsync.cpp
+        src/boot/appsyncmanager.cpp
+        src/boot/audit/libaudit.cpp
+        src/boot/auditd.cpp
+        src/boot/daemon.cpp
+        src/boot/daemon_v3.cpp
+        src/boot/emergency.cpp
+        src/boot/init.cpp
+        src/boot/init/cutils/uevent.cpp
+        src/boot/init/devices.cpp
+        src/boot/init/uevent_listener.cpp
+        src/boot/mount_fstab.cpp
+        src/boot/packages.cpp
+        src/boot/properties.cpp
+        src/boot/property_service.cpp
+        src/boot/reboot.cpp
+        src/boot/uevent_dump.cpp
+        src/boot/uevent_thread.cpp
+        src/main.cpp
         ${CMAKE_SOURCE_DIR}/external/pugixml/src/pugixml.cpp
     )
+
     add_executable(
         mbtool_recovery
-        archive_util.cpp
-        backup.cpp
-        bootimg_util.cpp
-        image.cpp
-        installer.cpp
-        installer_util.cpp
-        main.cpp
-        multiboot.cpp
-        ramdisk_patcher.cpp
-        rom_installer.cpp
-        romconfig.cpp
-        roms.cpp
-        sepolpatch.cpp
-        signature.cpp
-        switcher.cpp
-        update_binary.cpp
-        update_binary_tool.cpp
-        utilities.cpp
-        wipe.cpp
-        src/util/legacy_property_service.cpp
-        ${CMAKE_CURRENT_BINARY_DIR}/gen/validcerts.cpp
+        src/main.cpp
+        src/recovery/archive_util.cpp
+        src/recovery/backup.cpp
+        src/recovery/bootimg_util.cpp
+        src/recovery/image.cpp
+        src/recovery/installer.cpp
+        src/recovery/installer_util.cpp
+        src/recovery/ramdisk_patcher.cpp
+        src/recovery/rom_installer.cpp
+        src/recovery/update_binary.cpp
+        src/recovery/update_binary_tool.cpp
+        src/recovery/utilities.cpp
     )
 
-    foreach(target mbtool mbtool_recovery)
+    foreach(target mbtool-util mbtool mbtool_recovery)
         # Includes
         target_include_directories(
             ${target}
             PRIVATE
-            .
             include
             ${CMAKE_SOURCE_DIR}/external/flatbuffers/include
             ${CMAKE_SOURCE_DIR}/external/minizip
@@ -156,31 +152,34 @@ if(${MBP_BUILD_TARGET} STREQUAL android-system)
     android_link_allow_multiple_definitions(mbtool mbtool_recovery)
 
     target_link_libraries(
-        mbtool
+        mbtool-util
         PRIVATE
         interface.global.CXXVersion
+        PUBLIC
         mbutil-static
         mbsign-static
         mbdevice-static
         mblog-static
-        mbbootimg-static
         mbcommon-static
-        libminizip
         rapidjson
+    )
+
+    target_link_libraries(
+        mbtool
+        PRIVATE
+        interface.global.CXXVersion
+        mbtool-util
+        mbbootimg-static
+        libminizip
         Procps::Procps
     )
     target_link_libraries(
         mbtool_recovery
         PRIVATE
         interface.global.CXXVersion
-        mbutil-static
-        mbsign-static
-        mblog-static
-        mbdevice-static
+        mbtool-util
         mbbootimg-static
-        mbcommon-static
         libminizip
-        rapidjson
         LibArchive::LibArchive
         Procps::Procps # TODO
     )

mbtool/external.yaml

@@ -1,15 +1,15 @@
 ---
 - files:
-    - include/initwrapper/cutils/uevent.h
-    - include/initwrapper/devices.h
-    - include/initwrapper/uevent.h
-    - include/initwrapper/uevent_listener.h
-    - include/initwrapper/unique_fd.h
-    - include/util/property_service.h
-    - src/initwrapper/cutils/uevent.cpp
-    - src/initwrapper/devices.cpp
-    - src/initwrapper/uevent_listener.cpp
-    - src/util/property_service.cpp
+    - include/boot/init/cutils/uevent.h
+    - include/boot/init/devices.h
+    - include/boot/init/uevent.h
+    - include/boot/init/uevent_listener.h
+    - include/boot/init/unique_fd.h
+    - include/boot/property_service.h
+    - src/boot/init/cutils/uevent.cpp
+    - src/boot/init/devices.cpp
+    - src/boot/init/uevent_listener.cpp
+    - src/boot/property_service.cpp
   repo: https://android.googlesource.com/platform/system/core
   tag: android-8.1.0_r29
   commit: cb0f6139bd58d9e0113b6c75f5f7965ca7850179

mbtool/appsync.h → mbtool/include/boot/appsync.h

@@ -22,7 +22,6 @@
 namespace mb
 {
 
-int appsync();
 int appsync_main(int argc, char *argv[]);
 
-}
+}

mbtool/appsyncmanager.h → mbtool/include/boot/appsyncmanager.h

@@ -21,9 +21,9 @@
 
 #include <string>
 
-#include "packages.h"
-#include "roms.h"
-#include "romconfig.h"
+#include "boot/packages.h"
+#include "util/roms.h"
+#include "util/romconfig.h"
 
 namespace mb
 {

mbtool/include/initwrapper/devices.h → mbtool/include/boot/init/devices.h

@@ -29,7 +29,7 @@
 
 #include "mbutil/path.h"
 
-#include "initwrapper/uevent.h"
+#include "boot/init/uevent.h"
 
 namespace android {
 namespace init {

mbtool/include/initwrapper/uevent_listener.h → mbtool/include/boot/init/uevent_listener.h

@@ -23,8 +23,8 @@
 
 #include <dirent.h>
 
-#include "initwrapper/uevent.h"
-#include "initwrapper/unique_fd.h"
+#include "boot/init/uevent.h"
+#include "boot/init/unique_fd.h"
 
 #define UEVENT_MSG_LEN 2048
 

mbtool/mount_fstab.h → mbtool/include/boot/mount_fstab.h

@@ -22,7 +22,7 @@
 #include "mbcommon/flags.h"
 #include "mbdevice/device.h"
 
-#include "roms.h"
+#include "util/roms.h"
 
 namespace android::init
 {

mbtool/include/util/uevent_thread.h → mbtool/include/boot/uevent_thread.h

@@ -22,8 +22,8 @@
 #include <optional>
 #include <thread>
 
-#include "initwrapper/devices.h"
-#include "initwrapper/uevent_listener.h"
+#include "boot/init/devices.h"
+#include "boot/init/uevent_listener.h"
 
 namespace mb
 {

mbtool/installer.h → mbtool/include/recovery/installer.h

@@ -28,8 +28,8 @@
 #include "mbcommon/flags.h"
 #include "mbdevice/device.h"
 
-#include "roms.h"
 #include "util/legacy_property_service.h"
+#include "util/roms.h"
 
 namespace mb
 {

mbtool/installer_util.h → mbtool/include/recovery/installer_util.h

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include "ramdisk_patcher.h"
+#include "recovery/ramdisk_patcher.h"
 
 namespace mb
 {

mbtool/ramdisk_patcher.h → mbtool/include/recovery/ramdisk_patcher.h

@@ -21,7 +21,6 @@
 
 #include <functional>
 #include <string>
-//#include <vector>
 
 namespace mb
 {

mbtool/wipe.h → mbtool/include/util/wipe.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "roms.h"
+#include "util/roms.h"
 
 namespace mb
 {