独立编译整改

Signed-off-by: kangchongtao <kangchongtao@huawei.com>
Change-Id: Icc37d79355c24911371e305f727efed40b59a270

adapter/ohos/capability/BUILD.gn

@@ -36,6 +36,8 @@ template("ace_capability_ohos_source_set") {
       "time/time_event_proxy_ohos.cpp",
     ]
     include_dirs = []
+
+    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
     external_deps = [
       "ability_base:want",
       "common_event_service:cesfwk_innerkits",

adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn

@@ -49,7 +49,7 @@ template("js_pa_engine_ark") {
     configs = [ "$ace_root:ace_config" ]
 
     include_dirs = [ "$ace_root/adapter/ohos/entrance/pa_engine/engine/common" ]
-    deps = []
+    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
     external_deps = [
       "ability_base:want",
       "ability_base:zuri",

adapter/ohos/tools/raw_input_injector/BUILD.gn

@@ -29,7 +29,7 @@ ohos_source_set("rawinput-injector") {
     debug = false
   }
 
-  external_deps = [
+  public_external_deps = [
     "c_utils:utils",
     "input:libmmi-client",
   ]

adapter/preview/inspector/BUILD.gn

@@ -19,6 +19,7 @@ ohos_source_set("preview_inspector_source") {
   part_name = ace_engine_part
   if (defined(current_platform.name)) {
     defines = []
+    include_dirs = [ "//commonlibrary/c_utils/base/include/" ]
     config = {
     }
     if (defined(current_platform.config)) {

adapter/preview/osal/BUILD.gn

@@ -50,6 +50,7 @@ ohos_source_set("preview_osal_source") {
       defines += config.defines
     }
 
+    include_dirs = [ "//commonlibrary/c_utils/base/include" ]
     sources = [
       "${ace_root}/adapter/ohos/osal/log_wrapper.cpp",
       "ace_checker.cpp",
@@ -145,7 +146,7 @@ ohos_source_set("preview_osal_source") {
         "frame_trace_adapter_impl.cpp",
         "resource_adapter_impl.cpp",
       ]
-      include_dirs = [ "//prebuilts/ace-toolkit/preview/rich/include/resmgr/resourcemanager/include" ]
+      include_dirs += [ "//prebuilts/ace-toolkit/preview/rich/include/resmgr/resourcemanager/include" ]
       if (platform == "windows") {
         defines += [ "NOGDI" ]
         libs = [ "//prebuilts/ace-toolkit/preview/rich/lib/windows/tv/libresourcemanager_win.lib" ]

frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn

@@ -312,7 +312,10 @@ template("declarative_js_engine_ark") {
       "nativeModule/ui_context_helper.cpp",
     ]
 
-    deps = [ "${ace_root}/frameworks/core/interfaces/native:ace_core_interfaces_native_node_$platform" ]
+    deps = [
+      "$ace_root/frameworks/core/components/theme:build_theme_code",
+      "${ace_root}/frameworks/core/interfaces/native:ace_core_interfaces_native_node_$platform",
+    ]
     if (is_arkui_x) {
       deps += [ "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/drawing:drawing_napi_impl" ]
     }
@@ -427,6 +430,7 @@ template("declarative_js_engine_ark") {
     if (defined(config.build_for_preview) && config.build_for_preview) {
       deps += [ ":gen_obj_src_abc_mock_system_plugin" ]
       sources += [ "utils/jsi_module_searcher.cpp" ]
+      include_dirs += [ "//commonlibrary/c_utils/base/include/" ]
     } else if (defined(config.use_build_in_js_engine) &&
                config.use_build_in_js_engine) {
       if (platform == "ohos_ng" || is_arkui_x) {

frameworks/bridge/js_frontend/engine/jsi/BUILD.gn

@@ -16,30 +16,32 @@ import("//build/ohos.gni")
 import("//foundation/arkui/ace_engine/ace_config.gni")
 import("//foundation/arkui/ace_engine/build/ace_gen_obj.gni")
 
-base_output_path = get_label_info(":gen_abc_proxyclass", "target_out_dir")
-abcstrip_native_min_obj_path = base_output_path + "strip.native.min.abc"
+if (is_arkui_x || use_mac || use_mingw_win || use_linux) {
+  base_output_path = get_label_info(":gen_abc_proxyclass", "target_out_dir")
+  abcstrip_native_min_obj_path = base_output_path + "strip.native.min.abc"
 
-es2abc_gen_abc("gen_strip_native_min_abc") {
-  extra_visibility = [ ":*" ]  # Only targets in this file can depend on this.
-  src_js = rebase_path(
-          "$root_out_dir/obj/third_party/jsframework/dist/strip.native.min.js")
-  dst_file = rebase_path(base_output_path + "/strip.native.min.abc")
+  es2abc_gen_abc("gen_strip_native_min_abc") {
+    extra_visibility = [ ":*" ]  # Only targets in this file can depend on this.
+    src_js = rebase_path(
+            "$root_out_dir/obj/third_party/jsframework/dist/strip.native.min.js")
+    dst_file = rebase_path(base_output_path + "/strip.native.min.abc")
 
-  in_puts =
-      [ "$root_out_dir/obj/third_party/jsframework/dist/strip.native.min.js" ]
-  out_puts = [ base_output_path + "/strip.native.min.abc" ]
-  extra_dependencies = [ "//third_party/jsframework:gen_snapshot" ]
-}
-
-gen_obj("abc_strip_native_min") {
-  input = base_output_path + "/strip.native.min.abc"
-  if (use_mac || use_mingw_win || use_ios || use_linux) {
-    abcstripnativemin_obj_path = base_output_path + "/strip_native_min.c"
-  } else {
-    abcstripnativemin_obj_path = base_output_path + "/strip_native_min.o"
+    in_puts =
+        [ "$root_out_dir/obj/third_party/jsframework/dist/strip.native.min.js" ]
+    out_puts = [ base_output_path + "/strip.native.min.abc" ]
+    extra_dependencies = [ "//third_party/jsframework:gen_snapshot" ]
+  }
+
+  gen_obj("abc_strip_native_min") {
+    input = base_output_path + "/strip.native.min.abc"
+    if (use_mac || use_mingw_win || use_ios || use_linux) {
+      abcstripnativemin_obj_path = base_output_path + "/strip_native_min.c"
+    } else {
+      abcstripnativemin_obj_path = base_output_path + "/strip_native_min.o"
+    }
+    output = abcstripnativemin_obj_path
+    snapshot_dep = [ ":gen_strip_native_min_abc" ]
   }
-  output = abcstripnativemin_obj_path
-  snapshot_dep = [ ":gen_strip_native_min_abc" ]
 }
 
 template("js_engine_ark") {
@@ -87,7 +89,7 @@ template("js_engine_ark") {
     }
 
     external_deps = []
-    deps = []
+    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
     if (use_hilog) {
       external_deps = [ "hilog:libhilog" ]
     }
@@ -110,10 +112,8 @@ template("js_engine_ark") {
       ]
     } else {
       external_deps += [
-        "css-what:css_what_sources",
         "image_framework:image",
         "image_framework:image_native",
-        "jsframework:ark_build",
         "napi:ace_napi",
       ]
     }

frameworks/core/common/ai/image_analyzer_loader.h

@@ -19,6 +19,9 @@
 #define NAPI_VERSION 8
 
 #include <memory>
+
+#include "js_native_api_types.h"
+
 #include "interfaces/inner_api/ace/ai/image_analyzer_interface.h"
 
 namespace OHOS::Ace {

interfaces/inner_api/ace/ai/data_detector_interface.h

@@ -22,7 +22,7 @@
 #include <variant>
 #include <vector>
 
-#include "commonlibrary/c_utils/base/include/refbase.h"
+#include "refbase.h"
 
 namespace OHOS {
 class IRemoteObject;

interfaces/inner_api/ace/ai/image_analyzer.h

@@ -30,7 +30,6 @@
 #include "base/geometry/ng/vector.h"
 #include "base/memory/ace_type.h"
 #include "core/components/common/layout/constants.h"
-#include "third_party/node/src/js_native_api_types.h"
 #include "core/components_ng/property/measure_property.h"
 
 namespace OHOS::Ace {

test/unittest/BUILD.gn

@@ -64,6 +64,8 @@ config("ace_unittest_config") {
     "//third_party/icu/icu4c/source/common",
     "//third_party/skia",
     "//foundation/window/window_manager/interfaces/innerkits",
+    "//commonlibrary/c_utils/base/include/",
+    "//third_party/node/src",
   ]
   if (ace_engine_feature_enable_split_mode &&
       defined(vendor_configs.ace_engine_advanced_split_mode_dirs)) {