support filename when compiling MMKV for Android in Win32 env

yangxiaoge · Aug 6, 2019 · 8bffb6c · 8bffb6c
1 parent 6d9a7bc
commit 8bffb6c
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 43 deletions.
diff --git a/Android/MMKV/mmkv/src/androidTest/java/com/tencent/mmkv/MMKVTest.java b/Android/MMKV/mmkv/src/androidTest/java/com/tencent/mmkv/MMKVTest.java
@@ -20,19 +20,17 @@
 
 package com.tencent.mmkv;
 
+import static org.junit.Assert.*;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.SystemClock;
 import androidx.test.InstrumentationRegistry;
-
+import java.util.HashSet;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.HashSet;
-
-import static org.junit.Assert.*;
-
 public class MMKVTest {
 
     static MMKV mmkv;

diff --git a/Android/MMKV/mmkv/src/main/cpp/MMKVLog.cpp b/Android/MMKV/mmkv/src/main/cpp/MMKVLog.cpp
@@ -36,6 +36,18 @@ MMKVLogLevel g_currentLogLevel = MMKVLogDebug;
 MMKVLogLevel g_currentLogLevel = MMKVLogInfo;
 #endif
 
+const char *_getFileName(const char *path) {
+    const char *ptr = strrchr(path, '/');
+    if (!ptr) {
+        ptr = strrchr(path, '\\');
+    }
+    if (ptr) {
+        return ptr + 1;
+    } else {
+        return path;
+    }
+}
+
 static android_LogPriority MMKVLogLevelDesc(MMKVLogLevel level) {
     switch (level) {
         case MMKVLogDebug:

diff --git a/Android/MMKV/mmkv/src/main/cpp/MMKVLog.h b/Android/MMKV/mmkv/src/main/cpp/MMKVLog.h
@@ -42,7 +42,9 @@ enum MMKVLogLevel : uint32_t {
 extern bool g_isLogRedirecting;
 extern MMKVLogLevel g_currentLogLevel;
 
-#define __filename__ (strrchr(__FILE__, '/') + 1)
+extern const char *_getFileName(const char *path);
+
+#define __filename__ _getFileName(__FILE__)
 
 #define MMKVError(format, ...)                                                                     \
     _MMKVLogWithLevel(MMKVLogError, __filename__, __func__, __LINE__, format, ##__VA_ARGS__)

diff --git a/Android/MMKV/mmkv/src/main/java/com/tencent/mmkv/MMKV.java b/Android/MMKV/mmkv/src/main/java/com/tencent/mmkv/MMKV.java
@@ -27,9 +27,8 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.annotation.Nullable;
 import android.util.Log;
-
+import androidx.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.EnumMap;

diff --git a/Android/MMKV/mmkv/src/main/java/com/tencent/mmkv/MMKVContentProvider.java b/Android/MMKV/mmkv/src/main/java/com/tencent/mmkv/MMKVContentProvider.java
@@ -31,9 +31,9 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
 
 public class MMKVContentProvider extends ContentProvider {
 

diff --git a/Android/MMKV/mmkv/src/main/java/com/tencent/mmkv/ParcelableMMKV.java b/Android/MMKV/mmkv/src/main/java/com/tencent/mmkv/ParcelableMMKV.java
@@ -23,7 +23,6 @@
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
 import android.os.Parcelable;
-
 import java.io.IOException;
 
 public final class ParcelableMMKV implements Parcelable {

diff --git a/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/Baseline.java b/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/Baseline.java
@@ -20,14 +20,13 @@
 
 package com.tencent.mmkvdemo;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import static android.content.Context.MODE_PRIVATE;
 
-import java.util.Random;
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.util.Log;
-
 import com.tencent.mmkv.MMKV;
+import java.util.Random;
 
 public final class Baseline {
     private String[] m_arrStrings;

diff --git a/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/BenchMarkBaseService.java b/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/BenchMarkBaseService.java
@@ -24,13 +24,11 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.IBinder;
-import androidx.annotation.Nullable;
 import android.util.Log;
-
-import java.util.Random;
-
+import androidx.annotation.Nullable;
 import com.tencent.mmkv.MMKV;
 import com.tencent.mmkv.ParcelableMMKV;
+import java.util.Random;
 
 public abstract class BenchMarkBaseService extends Service {
     public static final String CMD_ID = "cmd_id";

diff --git a/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MainActivity.java b/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MainActivity.java
@@ -20,31 +20,28 @@
 
 package com.tencent.mmkvdemo;
 
+import static com.tencent.mmkvdemo.BenchMarkBaseService.AshmemMMKV_ID;
+import static com.tencent.mmkvdemo.BenchMarkBaseService.AshmemMMKV_Size;
+
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.SystemClock;
-import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
-
-import java.util.Arrays;
-import java.util.HashSet;
-
+import androidx.appcompat.app.AppCompatActivity;
+import com.getkeepsafe.relinker.ReLinker;
 import com.tencent.mmkv.MMKV;
 import com.tencent.mmkv.MMKVHandler;
-import com.tencent.mmkv.MMKVRecoverStrategic;
 import com.tencent.mmkv.MMKVLogLevel;
-import com.getkeepsafe.relinker.ReLinker;
+import com.tencent.mmkv.MMKVRecoverStrategic;
 import com.tencent.mmkv.NativeBuffer;
-
+import java.util.Arrays;
+import java.util.HashSet;
 import org.jetbrains.annotations.Nullable;
 
-import static com.tencent.mmkvdemo.BenchMarkBaseService.AshmemMMKV_ID;
-import static com.tencent.mmkvdemo.BenchMarkBaseService.AshmemMMKV_Size;
-
 public class MainActivity extends AppCompatActivity implements MMKVHandler {
     static private final String KEY_1 = "Ashmem_Key_1";
     static private final String KEY_2 = "Ashmem_Key_2";

diff --git a/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MultiProcessSharedPreferences.java b/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MultiProcessSharedPreferences.java
@@ -1,16 +1,5 @@
 package com.tencent.mmkvdemo;
 
-import java.lang.ref.SoftReference;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentProvider;
 import android.content.ContentResolver;
@@ -28,6 +17,16 @@
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Bundle;
+import java.lang.ref.SoftReference;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 使用ContentProvider实现多进程SharedPreferences读写;<br>

diff --git a/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MyService.java b/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MyService.java
@@ -22,7 +22,6 @@
 
 import android.content.Intent;
 import android.util.Log;
-
 import com.tencent.mmkv.MMKV;
 
 public class MyService extends BenchMarkBaseService {

diff --git a/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MyService_1.java b/Android/MMKV/mmkvdemo/src/main/java/com/tencent/mmkvdemo/MyService_1.java
@@ -26,7 +26,6 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
-
 import com.tencent.mmkv.ParcelableMMKV;
 
 public class MyService_1 extends BenchMarkBaseService implements ServiceConnection {