Small native code reorganization

native/jni/magiskboot/bootimg.cpp

@@ -9,12 +9,12 @@
 
 #include <mincrypt/sha.h>
 #include <mincrypt/sha256.h>
-#include <utils.h>
-#include <logging.h>
+#include <utils.hpp>
+#include <logging.hpp>
 
-#include "bootimg.h"
-#include "magiskboot.h"
-#include "compress.h"
+#include "bootimg.hpp"
+#include "magiskboot.hpp"
+#include "compress.hpp"
 
 using namespace std;
 

native/jni/magiskboot/bootimg.hpp

@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <utility>
-#include "format.h"
+#include "format.hpp"
 
 /****************
  * Other Headers

native/jni/magiskboot/compress.cpp

@@ -13,11 +13,11 @@
 #include <lz4frame.h>
 #include <lz4hc.h>
 
-#include <logging.h>
-#include <utils.h>
+#include <logging.hpp>
+#include <utils.hpp>
 
-#include "magiskboot.h"
-#include "compress.h"
+#include "magiskboot.hpp"
+#include "compress.hpp"
 
 using namespace std;
 

native/jni/magiskboot/compress.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <stream.h>
+#include <stream.hpp>
 
-#include "format.h"
+#include "format.hpp"
 
 stream_ptr get_encoder(format_t type, stream_ptr &&base);
 

native/jni/magiskboot/dtb.cpp

@@ -7,10 +7,10 @@
 extern "C" {
 #include <libfdt.h>
 }
-#include <utils.h>
+#include <utils.hpp>
 
-#include "magiskboot.h"
-#include "dtb.h"
+#include "magiskboot.hpp"
+#include "dtb.hpp"
 
 using namespace std;
 

native/jni/magiskboot/format.cpp

@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "format.h"
+#include "format.hpp"
 
 std::map<std::string_view, format_t> name2fmt;
 Fmt2Name fmt2name;

native/jni/magiskboot/hexpatch.cpp

@@ -3,9 +3,9 @@
 #include <string.h>
 #include <sys/mman.h>
 
-#include <utils.h>
+#include <utils.hpp>
 
-#include "magiskboot.h"
+#include "magiskboot.hpp"
 
 static void hex2byte(uint8_t *hex, uint8_t *str) {
 	char high, low;

native/jni/magiskboot/main.cpp

@@ -5,12 +5,12 @@
 #include <sys/mman.h>
 
 #include <mincrypt/sha.h>
-#include <logging.h>
-#include <utils.h>
+#include <logging.hpp>
+#include <utils.hpp>
 #include <flags.h>
 
-#include "magiskboot.h"
-#include "compress.h"
+#include "magiskboot.hpp"
+#include "compress.hpp"
 
 using namespace std;
 

native/jni/magiskboot/pattern.cpp

@@ -1,9 +1,9 @@
 #include <malloc.h>
 #include <string.h>
 
-#include <utils.h>
+#include <utils.hpp>
 
-#include "magiskboot.h"
+#include "magiskboot.hpp"
 
 #define MATCH(p) else if (strncmp(s + skip, p, sizeof(p) - 1) == 0) skip += (sizeof(p) - 1)
 

native/jni/magiskboot/ramdisk.cpp

@@ -2,11 +2,11 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include <utils.h>
-#include <cpio.h>
+#include <utils.hpp>
+#include <cpio.hpp>
 
-#include "magiskboot.h"
-#include "compress.h"
+#include "magiskboot.hpp"
+#include "compress.hpp"
 
 using namespace std;