Modify header file reference

Issue:https://gitee.com/openharmony/ability_ability_runtime/issues/IAXQ6V

Signed-off-by: shaoxiangdong <shaoxiangdong@huawei.com>
Change-Id: I2aad502d876516602b479f93b55a992510cb448a

bundle.json

@@ -93,7 +93,7 @@
                     "name": "//commonlibrary/ets_utils/js_sys_module/timer:timer",
                     "header": {
                       "header_files": [
-                        "timer.h"
+                        "sys_timer.h"
                       ],
                       "header_base": "//commonlibrary/ets_utils/js_sys_module/timer"
                     }

js_concurrent_module/taskpool/task_manager.cpp

@@ -30,7 +30,7 @@
 #include "status_receiver_interface.h"
 #include "system_ability_definition.h"
 #endif
-#include "commonlibrary/ets_utils/js_sys_module/timer/timer.h"
+#include "sys_timer.h"
 #include "helper/concurrent_helper.h"
 #include "helper/error_helper.h"
 #include "helper/hitrace_helper.h"

js_concurrent_module/taskpool/worker.cpp

@@ -19,7 +19,7 @@
 #include "c/executor_task.h"
 #include "ffrt_inner.h"
 #endif
-#include "commonlibrary/ets_utils/js_sys_module/timer/timer.h"
+#include "sys_timer.h"
 #include "helper/hitrace_helper.h"
 #include "process_helper.h"
 #include "task_group.h"

js_concurrent_module/worker/BUILD.gn

@@ -106,7 +106,7 @@ ohos_source_set("worker_static") {
 
   sources = [
     "$js_concurrent_module_common/helper/napi_helper.cpp",
-    "$sys_module/timer/timer.cpp",
+    "$sys_module/timer/sys_timer.cpp",
     "message_queue.cpp",
     "native_module_worker.cpp",
     "thread.cpp",
@@ -138,7 +138,7 @@ ohos_source_set("worker_static") {
     ]
     sources -= [
       "$js_concurrent_module_common/helper/napi_helper.cpp",
-      "$sys_module/timer/timer.cpp",
+      "$sys_module/timer/sys_timer.cpp",
     ]
     defines += [ "__ARKUI_CROSS__" ]
     deps += [

js_concurrent_module/worker/worker.cpp

@@ -15,7 +15,7 @@
 
 #include "worker.h"
 
-#include "commonlibrary/ets_utils/js_sys_module/timer/timer.h"
+#include "sys_timer.h"
 #include "helper/concurrent_helper.h"
 #include "helper/error_helper.h"
 #include "helper/hitrace_helper.h"

js_sys_module/console/BUILD.gn

@@ -16,7 +16,10 @@ import("//commonlibrary/ets_utils/ets_utils_config.gni")
 
 config("console_public_config") {
   visibility = [ ":*" ]
-  include_dirs = [ "${sys_module}/console" ]
+  include_dirs = [
+    "${sys_module}/console",
+    js_concurrent_module_common,
+  ]
 }
 
 ohos_shared_library("console") {

js_sys_module/console/console.h

@@ -19,9 +19,9 @@
 #include <string>
 #include <thread>
 
-#include "commonlibrary/ets_utils/js_concurrent_module/common/helper/napi_helper.h"
-#include "commonlibrary/ets_utils/js_concurrent_module/common/helper/object_helper.h"
-#include "commonlibrary/ets_utils/js_concurrent_module/common/helper/error_helper.h"
+#include "helper/napi_helper.h"
+#include "helper/object_helper.h"
+#include "helper/error_helper.h"
 #include "napi/native_api.h"
 #include "napi/native_node_api.h"
 

js_sys_module/timer/BUILD.gn

@@ -14,6 +14,13 @@
 import("//build/ohos.gni")
 import("//commonlibrary/ets_utils/ets_utils_config.gni")
 
+config("timer_public_config") {
+  include_dirs = [
+    "${sys_module}/timer",
+    js_concurrent_module_common,
+  ]
+}
+
 ohos_shared_library("timer") {
   branch_protector_ret = "pac_ret"
   sanitize = {
@@ -29,11 +36,13 @@ ohos_shared_library("timer") {
 
   sources = [
     "../../js_concurrent_module/common/helper/napi_helper.cpp",
-    "timer.cpp",
+    "sys_timer.cpp",
   ]
 
   deps = []
 
+  public_configs = [ ":timer_public_config" ]
+
   defines = []
 
   external_deps = [ "napi:ace_napi" ]
@@ -85,7 +94,7 @@ ohos_source_set("timer_static") {
 
   sources = [
     "$js_concurrent_module_common/helper/napi_helper.cpp",
-    "timer.cpp",
+    "sys_timer.cpp",
   ]
 
   deps = []

js_sys_module/timer/sys_timer.cpp

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include "timer.h"
+#include "sys_timer.h"
 
 #include "native_engine/native_engine.h"
 #include "tools/log.h"

js_sys_module/timer/sys_timer.h

@@ -20,8 +20,8 @@
 #include <mutex>
 #include <uv.h>
 
-#include "commonlibrary/ets_utils/js_concurrent_module/common/helper/napi_helper.h"
-#include "commonlibrary/ets_utils/js_concurrent_module/common/helper/object_helper.h"
+#include "helper/napi_helper.h"
+#include "helper/object_helper.h"
 #ifdef ENABLE_CONTAINER_SCOPE
 #include "core/common/container_scope.h"
 #endif

js_sys_module/timer/test/test_timer.cpp

@@ -18,7 +18,7 @@
 #include "napi/native_node_api.h"
 #include "test.h"
 #include "test_timer.h"
-#include "../timer.h"
+#include "../sys_timer.h"
 #include "tools/log.h"
 
 using namespace Commonlibrary::Concurrent::Common;

js_sys_module/timer/test/test_timer.h

@@ -17,7 +17,7 @@
 #define TEST_TIMER_H
 
 #include "commonlibrary/ets_utils/js_concurrent_module/common/helper/napi_helper.h"
-#include "../timer.h"
+#include "../sys_timer.h"
 
 namespace OHOS::JsSysModule {
 class TimerTest {