Change ThreadLocker's location

apache · Jul 12, 2019 · cab9ab7 · cab9ab7
1 parent 674f95f
commit cab9ab7
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/weex_core/Source/android/jsengine/task/back_to_weex_core_queue.h b/weex_core/Source/android/jsengine/task/back_to_weex_core_queue.h
@@ -29,7 +29,7 @@
 #include <third_party/IPC/IPCResult.h>
 #include <third_party/IPC/IPCMessageJS.h>
 #include <vector>
-#include "base/utils/ThreadLocker.h"
+#include "base/utils/android/ThreadLocker.h"
 #include "base/closure.h"
 
 class BackToWeexCoreQueue {

diff --git a/weex_core/Source/android/jsengine/task/timer_queue.h b/weex_core/Source/android/jsengine/task/timer_queue.h
@@ -27,7 +27,7 @@
 #include <deque>
 
 #include "android/jsengine/task/timer_task.h"
-#include "base/utils/ThreadLocker.h"
+#include "base/utils/android/ThreadLocker.h"
 
 class TimerTask;
 class WeexTaskQueue;

diff --git a/weex_core/Source/android/jsengine/task/weex_task.h b/weex_core/Source/android/jsengine/task/weex_task.h
@@ -25,7 +25,7 @@
 
 #include "base/time_calculator.h"
 #include "android/jsengine/weex_runtime.h"
-#include "base/utils/ThreadLocker.h"
+#include "base/utils/android/ThreadLocker.h"
 
 class WeexTask {
 

diff --git a/weex_core/Source/base/CMakeLists.txt b/weex_core/Source/base/CMakeLists.txt
@@ -64,8 +64,6 @@ set(${BASE_LIBRARY_NAME}_SOURCES
     third_party/icu/icu_utf.cpp
     utils/log_utils.h
     utils/log_utils.cpp
-    utils/ThreadLocker.h
-    utils/ThreadLocker.cpp   
     )
 
 if (ANDROID)
@@ -92,6 +90,8 @@ if (ANDROID)
         android/jni/jbytearray_ref.cpp
         android/jni/scoped_java_ref.h
         android/jni/scoped_java_ref.cpp
+        android/ThreadLocker.h
+        android/ThreadLocker.cpp
        )
     list(APPEND ${BASE_LIBRARY_NAME}_SOURCES
         ${BASE_ANDROID_SOURCES}

diff --git a/weex_core/Source/base/utils/Compatible.cpp → weex_core/Source/base/android/Compatible.cpp b/weex_core/Source/base/utils/Compatible.cpp → weex_core/Source/base/android/Compatible.cpp
diff --git a/weex_core/Source/base/utils/ThreadLocker.cpp → ...core/Source/base/android/ThreadLocker.cpp b/weex_core/Source/base/utils/ThreadLocker.cpp → ...core/Source/base/android/ThreadLocker.cpp
@@ -20,7 +20,7 @@
 // Created by Darin on 14/06/2018.
 //
 
-#include "base/utils/ThreadLocker.h"
+#include "ThreadLocker.h"
 
 int ThreadLocker::lock() {
     return pthread_mutex_lock(&mutex_);

diff --git a/weex_core/Source/base/utils/ThreadLocker.h → weex_core/Source/base/android/ThreadLocker.h b/weex_core/Source/base/utils/ThreadLocker.h → weex_core/Source/base/android/ThreadLocker.h
diff --git a/weex_core/Source/js_runtime/weex/task/back_to_weex_core_queue.h b/weex_core/Source/js_runtime/weex/task/back_to_weex_core_queue.h
@@ -29,7 +29,7 @@
 #include <third_party/IPC/IPCResult.h>
 #include <third_party/IPC/IPCMessageJS.h>
 #include <vector>
-#include "base/utils/ThreadLocker.h"
+#include "base/android/ThreadLocker.h"
 #include "base/closure.h"
 
 class BackToWeexCoreQueue {

diff --git a/weex_core/Source/js_runtime/weex/task/timer_queue.h b/weex_core/Source/js_runtime/weex/task/timer_queue.h
@@ -28,7 +28,7 @@
 
 //#include "android/jsengine/task/timer_task.h"
 #include "js_runtime/weex/task/timer_task.h"
-#include "base/utils/ThreadLocker.h"
+#include "base/android/ThreadLocker.h"
 
 class TimerTask;
 class WeexTaskQueue;

diff --git a/weex_core/Source/js_runtime/weex/task/weex_task.h b/weex_core/Source/js_runtime/weex/task/weex_task.h
@@ -24,7 +24,7 @@
 #define WEEXV8_WEEXTASK_H
 
 #include "base/time_calculator.h"
-#include "base/utils/ThreadLocker.h"
+#include "base/android/ThreadLocker.h"
 #include "js_runtime/weex/utils/weex_jsc_utils.h"
 #include "js_runtime/weex/object/weex_runtime_v2.h"
 //#include "android/jsengine/weex_runtime.h"