Page MenuHomePhabricator
Files F3359531

D4448.id14236.diff
No OneTemporary
Actions

D4448.id14236.diff
View Options

diff --git a/native/android/app/CMakeLists.txt b/native/android/app/CMakeLists.txt
--- a/native/android/app/CMakeLists.txt
+++ b/native/android/app/CMakeLists.txt
@@ -1,6 +1,6 @@
# For more information about using CMake with Android Studio, read the
# documentation: https://d.android.com/studio/projects/add-native-code.html
-project(comm)
+project(comm CXX C)
set (CMAKE_CXX_STANDARD 14)
@@ -70,16 +70,9 @@
./src/cpp
# comm native mutual code
- ../../cpp/CommonCpp/NativeModules
- ../../cpp/CommonCpp/NativeModules/InternalModules
- ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities
- ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/ThreadOperationsUtilities
- ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities
- ../../cpp/CommonCpp/NativeModules/PersistentStorageUtilities/MessageOperationsUtilities/MessageSpecs
- ../../cpp/CommonCpp/DatabaseManagers
- ../../cpp/CommonCpp/Tools
- ../../cpp/CommonCpp/grpc/_generated
- ../../cpp/CommonCpp/grpc
+ ../../cpp/CommonCpp/
+ ../../cpp/CommonCpp/NativeModules/
+ ../../cpp/CommonCpp/grpc/_generated/
)
# search for all cpp files in this directory
@@ -102,7 +95,7 @@
../../node_modules/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp
../../node_modules/react-native/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.cpp
../../node_modules/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp
-
+
# SQLCipher
${SQLCIPHER}
diff --git a/native/android/app/src/cpp/CommSecureStore.cpp b/native/android/app/src/cpp/CommSecureStore.cpp
--- a/native/android/app/src/cpp/CommSecureStore.cpp
+++ b/native/android/app/src/cpp/CommSecureStore.cpp
@@ -1,4 +1,4 @@
-#include "CommSecureStore.h"
+#include <Tools/CommSecureStore.h>
#include <fbjni/fbjni.h>
using namespace facebook::jni;
diff --git a/native/android/app/src/cpp/GlobalNetworkSingletonJNIHelper.cpp b/native/android/app/src/cpp/GlobalNetworkSingletonJNIHelper.cpp
--- a/native/android/app/src/cpp/GlobalNetworkSingletonJNIHelper.cpp
+++ b/native/android/app/src/cpp/GlobalNetworkSingletonJNIHelper.cpp
@@ -1,5 +1,5 @@
-#include "GlobalNetworkSingletonJNIHelper.h"
-#include "GlobalNetworkSingleton.h"
+#include <Internal/GlobalNetworkSingleton.h>
+#include <Internal/GlobalNetworkSingletonJNIHelper.h>
namespace comm {
void GlobalNetworkSingletonJNIHelper::sendPong(
diff --git a/native/android/app/src/cpp/Logger.cpp b/native/android/app/src/cpp/Logger.cpp
--- a/native/android/app/src/cpp/Logger.cpp
+++ b/native/android/app/src/cpp/Logger.cpp
@@ -1,4 +1,4 @@
-#include "Logger.h"
+#include <Tools/Logger.h>
#include <android/log.h>
diff --git a/native/android/app/src/cpp/MessageOperationsUtilitiesJNIHelper.cpp b/native/android/app/src/cpp/MessageOperationsUtilitiesJNIHelper.cpp
--- a/native/android/app/src/cpp/MessageOperationsUtilitiesJNIHelper.cpp
+++ b/native/android/app/src/cpp/MessageOperationsUtilitiesJNIHelper.cpp
@@ -1,6 +1,6 @@
-#include "MessageOperationsUtilitiesJNIHelper.h"
-#include "MessageOperationsUtilities.h"
-#include "SQLiteQueryExecutor.h"
+#include <DatabaseManagers/SQLiteQueryExecutor.h>
+#include <PersistentStorageUtilities/MessageOperationsUtilities/MessageOperationsUtilities.h>
+#include <PersistentStorageUtilities/MessageOperationsUtilities/MessageOperationsUtilitiesJNIHelper.h>
namespace comm {
void MessageOperationsUtilitiesJNIHelper::storeMessageInfos(
diff --git a/native/android/app/src/cpp/PlatformSpecificTools.cpp b/native/android/app/src/cpp/PlatformSpecificTools.cpp
--- a/native/android/app/src/cpp/PlatformSpecificTools.cpp
+++ b/native/android/app/src/cpp/PlatformSpecificTools.cpp
@@ -1,5 +1,5 @@
-#include "PlatformSpecificTools.h"
-#include "Logger.h"
+#include <Tools/Logger.h>
+#include <Tools/PlatformSpecificTools.h>
#include <fbjni/fbjni.h>
using namespace facebook::jni;
diff --git a/native/android/app/src/cpp/ThreadOperationsJNIHelper.cpp b/native/android/app/src/cpp/ThreadOperationsJNIHelper.cpp
--- a/native/android/app/src/cpp/ThreadOperationsJNIHelper.cpp
+++ b/native/android/app/src/cpp/ThreadOperationsJNIHelper.cpp
@@ -1,6 +1,6 @@
-#include "ThreadOperationsJNIHelper.h"
-#include "SQLiteQueryExecutor.h"
-#include "ThreadOperations.h"
+#include <DatabaseManagers/SQLiteQueryExecutor.h>
+#include <PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperations.h>
+#include <PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperationsJNIHelper.h>
namespace comm {
void ThreadOperationsJNIHelper::updateSQLiteUnreadStatus(
diff --git a/native/android/app/src/cpp/jsiInstaller.cpp b/native/android/app/src/cpp/jsiInstaller.cpp
--- a/native/android/app/src/cpp/jsiInstaller.cpp
+++ b/native/android/app/src/cpp/jsiInstaller.cpp
@@ -1,13 +1,13 @@
-#include "CommCoreModule.h"
-#include "GlobalNetworkSingletonJNIHelper.h"
-#include "MessageOperationsUtilitiesJNIHelper.h"
-#include "SQLiteQueryExecutor.h"
-#include "ThreadOperationsJNIHelper.h"
#include "jniHelpers.h"
#include <CallInvokerHolder.h>
#include <fbjni/fbjni.h>
#include <jsi/jsi.h>
+#include <DatabaseManagers/SQLiteQueryExecutor.h>
+#include <Internal/GlobalNetworkSingletonJNIHelper.h>
+#include <Native/CommCoreModule.h>
+#include <PersistentStorageUtilities/ThreadOperationsUtilities/ThreadOperationsJNIHelper.h>
+
namespace jni = facebook::jni;
namespace jsi = facebook::jsi;
namespace react = facebook::react;

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 9:35 AM (21 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2579188
Default Alt Text
D4448.id14236.diff (5 KB)

Event Timeline