diff --git a/ace_config.gni b/ace_config.gni index 773921c0cf2..0820bb01943 100644 --- a/ace_config.gni +++ b/ace_config.gni @@ -95,10 +95,6 @@ ability_runtime_services_path = "${ability_runtime_path}/services" accessibility_path = "//foundation/barrierfree/accessibility" app_framework_resource_path = "${app_framework_root}/resource_management" app_framework_window_path = "${app_framework_root}/window_manager" -flutter_root = "//third_party/flutter" -ace_flutter_engine_root = "$flutter_root/build" -expat_root = "//third_party/expat" -cjson_root = "//third_party/cJSON" jsoncpp_root = "//third_party/jsoncpp" ark_tools_root = "//prebuilts/ace-toolkit/ace-loader/panda" node_js_path = "//prebuilts/ace-toolkit/nodejs/current/bin/" @@ -109,7 +105,10 @@ ark_ets_path = "//arkcompiler/ets_runtime" crossplatform_plugin_root = "//plugins" crossplatform_multimedia_root = "//foundation/multimedia" skia_root_new = "//third_party/skia" -checking_function_root = "//third_party/bounds_checking_function" + +# arkui-x +flutter_root = "//third_party/flutter" +ace_flutter_engine_root = "$flutter_root/build" # Config toolchain windows_buildtool = "//build/toolchain/mingw:mingw_x86_64" diff --git a/adapter/ohos/entrance/BUILD.gn b/adapter/ohos/entrance/BUILD.gn index 14868cba35f..1d0bdec04ee 100644 --- a/adapter/ohos/entrance/BUILD.gn +++ b/adapter/ohos/entrance/BUILD.gn @@ -93,7 +93,6 @@ template("ace_ohos_standard_source_set") { deps += [ "$ace_root/adapter/ohos/capability:ace_capability_ohos", "$ace_root/interfaces/inner_api/ace:ace_uicontent", - "//third_party/zlib:shared_libz", ] external_deps = [ @@ -129,6 +128,7 @@ template("ace_ohos_standard_source_set") { "window_manager:libwsutils", "window_manager:scene_session", "window_manager:screen_session_manager_client", + "zlib:shared_libz", ] if (defined(config.enable_rosen_backend) && config.enable_rosen_backend) { diff --git a/adapter/preview/entrance/BUILD.gn b/adapter/preview/entrance/BUILD.gn index a963656dac1..810ec891385 100644 --- a/adapter/preview/entrance/BUILD.gn +++ b/adapter/preview/entrance/BUILD.gn @@ -68,7 +68,6 @@ ohos_source_set("preview_entrance_source") { ] external_deps = [] include_dirs = [ - "$flutter_root/engine", "//foundation/window/window_manager", "//foundation/ability/ability_runtime", "//arkcompiler/ets_runtime", diff --git a/adapter/preview/entrance/samples/BUILD.gn b/adapter/preview/entrance/samples/BUILD.gn index 153aca14f4a..4757e3404d1 100644 --- a/adapter/preview/entrance/samples/BUILD.gn +++ b/adapter/preview/entrance/samples/BUILD.gn @@ -49,7 +49,6 @@ foreach(device, ace_devices) { include_dirs = [ "$ace_root", "$ace_root/frameworks", - "$flutter_root/glfw/include", "//foundation/window/window_manager", "//ide/tools/previewer", ] diff --git a/adapter/preview/osal/BUILD.gn b/adapter/preview/osal/BUILD.gn index ae9b16296e0..ee7afcd59ce 100644 --- a/adapter/preview/osal/BUILD.gn +++ b/adapter/preview/osal/BUILD.gn @@ -29,16 +29,9 @@ ohos_source_set("utilsecurec_source") { defines += config.defines } if (platform == "windows") { - sources = [ - "//third_party/bounds_checking_function/src/memset_s.c", - "//third_party/bounds_checking_function/src/securecutil.c", - "//third_party/bounds_checking_function/src/secureinput_w.c", - "//third_party/bounds_checking_function/src/secureprintoutput_a.c", - "//third_party/bounds_checking_function/src/secureprintoutput_w.c", - ] + external_deps = [ "bounds_checking_function:libsec_shared" ] cflags = [ "-Wno-inconsistent-dllimport" ] } - configs = [ "//third_party/bounds_checking_function:libsec_public_config" ] } } @@ -107,7 +100,6 @@ ohos_source_set("preview_osal_source") { deps = [ ":utilsecurec_source", "//foundation/graphic/graphic_2d/rosen/modules/platform:image_native", - "//third_party/curl:curl_shared", ] if (ace_use_rosen_drawing) { @@ -117,13 +109,13 @@ ohos_source_set("preview_osal_source") { ] } - external_deps = [ "hilog:libhilog" ] - - configs = [ - "$ace_root:ace_config", - "//third_party/curl:curl_config", + external_deps = [ + "curl:curl_shared", + "hilog:libhilog", ] + configs = [ "$ace_root:ace_config" ] + include_dirs = [ "//commonlibrary/c_utils/base/include" ] if (is_ohos_standard_system) { diff --git a/build/ace_lib.gni b/build/ace_lib.gni index 4435b194b5e..3fd5893a102 100644 --- a/build/ace_lib.gni +++ b/build/ace_lib.gni @@ -29,11 +29,11 @@ template("libace_static") { } deps = [ "$ace_root/frameworks/base:ace_base_$platform" ] - + external_deps = [] if (use_mingw_win || use_mac || use_linux) { - deps += [ - "//third_party/icu/icu4c:shared_icui18n", - "//third_party/icu/icu4c:shared_icuuc", + external_deps += [ + "icu:shared_icui18n", + "icu:shared_icuuc", ] } @@ -94,7 +94,7 @@ template("libace_static") { } configs = [ "$ace_root:ace_coverage_config" ] if (use_hilog) { - external_deps = [ "hilog:libhilog" ] + external_deps += [ "hilog:libhilog" ] } part_name = ace_engine_part subsystem_name = ace_engine_subsystem diff --git a/bundle.json b/bundle.json index b501328981f..231314e1aee 100644 --- a/bundle.json +++ b/bundle.json @@ -77,23 +77,19 @@ "app_file_service", "ets_utils", "bounds_checking_function", - "ffrt" - ], - "third_party": [ - "json", - "skia", - "flutter", - "zlib", - "bounds_checking_function", - "curl", + "ffrt", + "icu", "cJSON", + "curl", "css-what", "jsframework", "opencl-headers", - "libuv", - "egl", "opengles", - "icu" + "zlib" + ], + "third_party": [ + "skia", + "libuv" ] }, "build": { diff --git a/frameworks/base/BUILD.gn b/frameworks/base/BUILD.gn index e7f88e9ed20..6f09dcbe1b3 100644 --- a/frameworks/base/BUILD.gn +++ b/frameworks/base/BUILD.gn @@ -34,6 +34,7 @@ template("ace_base_source_set") { "resource:ace_resource", ] external_deps = [] + include_dirs = [] if (use_hilog) { external_deps += [ "hilog:libhilog" ] } @@ -77,7 +78,6 @@ template("ace_base_source_set") { if (platform != "windows") { # add secure c API - include_dirs = [ "//third_party/bounds_checking_function/include" ] if (is_arkui_x) { deps += [ "//third_party/bounds_checking_function:libsec_static" ] } @@ -95,10 +95,10 @@ template("ace_base_source_set") { external_deps += [ "graphic_2d:librender_service_client" ] } - if (is_arkui_x || platform != "ohos") { + if (is_arkui_x) { deps += [ "//third_party/cJSON:cjson_static" ] } else { - deps += [ "//third_party/cJSON:cjson" ] + external_deps += [ "cJSON:cjson" ] } cflags_cc = [] diff --git a/frameworks/base/i18n/BUILD.gn b/frameworks/base/i18n/BUILD.gn index 57fd2f558f9..12c9d1f1de4 100644 --- a/frameworks/base/i18n/BUILD.gn +++ b/frameworks/base/i18n/BUILD.gn @@ -33,20 +33,27 @@ template("ace_base_i18n") { configs = [ ":ace_base_i18n_config", "$ace_root:ace_config", - "//third_party/icu/icu4c:icu_config", ] deps = [ "$ace_root/frameworks/base/resource:ace_resource" ] + external_deps = [] if (defined(config.use_external_icu) && config.use_external_icu == "static") { - deps += [ - "//third_party/icu/icu4c:static_icui18n", - "//third_party/icu/icu4c:static_icuuc", - ] + if (is_arkui_x) { + deps += [ + "//third_party/icu/icu4c:static_icui18n", + "//third_party/icu/icu4c:static_icuuc", + ] + } else { + external_deps += [ + "icu:static_icui18n", + "icu:static_icuuc", + ] + } } else { - deps += [ - "//third_party/icu/icu4c:shared_icui18n", - "//third_party/icu/icu4c:shared_icuuc", + external_deps += [ + "icu:shared_icui18n", + "icu:shared_icuuc", ] } @@ -57,7 +64,7 @@ template("ace_base_i18n") { ] if (use_hilog) { - external_deps = [ "hilog:libhilog" ] + external_deps += [ "hilog:libhilog" ] } subsystem_name = ace_engine_subsystem diff --git a/frameworks/base/network/BUILD.gn b/frameworks/base/network/BUILD.gn index 1bd336e3f74..f138e7c788d 100644 --- a/frameworks/base/network/BUILD.gn +++ b/frameworks/base/network/BUILD.gn @@ -17,8 +17,8 @@ import("//foundation/arkui/ace_engine/ace_config.gni") ohos_shared_library("ace_network") { sources = [ "download_manager_impl.cpp" ] configs = [ "$ace_root:ace_config" ] - deps = [ "//third_party/curl:curl_shared" ] external_deps = [ + "curl:curl_shared", "hilog:libhilog", "netmanager_base:net_conn_manager_if", "netmanager_base:net_conn_parcel", diff --git a/frameworks/base/resource/BUILD.gn b/frameworks/base/resource/BUILD.gn index 560d361dbbc..98175fc47d3 100644 --- a/frameworks/base/resource/BUILD.gn +++ b/frameworks/base/resource/BUILD.gn @@ -23,7 +23,7 @@ ohos_source_set("ace_resource") { } subsystem_name = ace_engine_subsystem part_name = ace_engine_part - include_dirs = [ "//third_party/bounds_checking_function/include" ] + include_dirs = [] # add resource file here sources = [ @@ -34,6 +34,7 @@ ohos_source_set("ace_resource") { ] if (current_os == "mac" || current_os == "mingw" || current_os == "ios" || current_os == "linux" || current_os == "android") { + include_dirs += [ "//third_party/bounds_checking_function/include" ] deps = [ ":binary_resource_mac_and_windows" ] sources += [ "internal_resource_previewer.cpp" ] } else { diff --git a/frameworks/bridge/js_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/js_frontend/engine/jsi/BUILD.gn index 772ec45970a..cb0f7cdb30f 100644 --- a/frameworks/bridge/js_frontend/engine/jsi/BUILD.gn +++ b/frameworks/bridge/js_frontend/engine/jsi/BUILD.gn @@ -73,10 +73,7 @@ template("js_engine_ark") { "jsi_stepper_bridge.cpp", ] - include_dirs = [ - "$flutter_root/engine", - "$c_utils_root/base/include", - ] + include_dirs = [ "$c_utils_root/base/include" ] cflags_cc = [ "-Wno-thread-safety-attributes" ] # xcomponent components supports phone, TV and wearable except PC Preview @@ -107,23 +104,18 @@ template("js_engine_ark") { "//third_party/jsframework:ark_build", ] } else if (defined(config.build_for_ios) && config.build_for_ios) { - deps += [ - ":gen_obj_src_abc_strip_native_min", - "//foundation/arkui/napi:ace_napi_static", - ] - deps += [ - "//third_party/css-what:css_what_sources", - "//third_party/jsframework:ark_build", - ] - external_deps += [ "napi:ace_napi" ] - } else { - deps += [ - "//third_party/css-what:css_what_sources", - "//third_party/jsframework:ark_build", - ] + deps += [ ":gen_obj_src_abc_strip_native_min" ] external_deps += [ + "css-what:css_what_sources", + "jsframework:ark_build", + "napi:ace_napi", + ] + } else { + external_deps += [ + "css-what:css_what_sources", "image_framework:image", "image_framework:image_native", + "jsframework:ark_build", "napi:ace_napi", ] } diff --git a/frameworks/core/BUILD.gn b/frameworks/core/BUILD.gn index 1b4f5b88244..cdeebf9cc0c 100644 --- a/frameworks/core/BUILD.gn +++ b/frameworks/core/BUILD.gn @@ -424,7 +424,7 @@ template("ace_core_source_set") { } if (defined(config.enable_image_compression) && config.enable_image_compression) { - deps += [ "//third_party/opencl-headers:libcl" ] + external_deps += [ "opencl-headers:libcl" ] defines += [ "ENABLE_OPENCL" ] } @@ -1028,7 +1028,7 @@ template("ace_core_ng_source_set") { if (defined(config.enable_image_compression) && config.enable_image_compression) { - deps += [ "//third_party/opencl-headers:libcl" ] + external_deps += [ "opencl-headers:libcl" ] defines += [ "ENABLE_OPENCL" ] } diff --git a/frameworks/core/animation/test/unittest/framework/BUILD.gn b/frameworks/core/animation/test/unittest/framework/BUILD.gn index e38905473fb..233a38d499a 100644 --- a/frameworks/core/animation/test/unittest/framework/BUILD.gn +++ b/frameworks/core/animation/test/unittest/framework/BUILD.gn @@ -210,7 +210,6 @@ ohos_unittest("AnimationTest") { deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code", - "$cjson_root:cjson", "//third_party/googletest:gtest_main", ] if (!is_ohos_standard_system) { @@ -224,7 +223,10 @@ ohos_unittest("AnimationTest") { [ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ] } - external_deps += [ "c_utils:utils" ] + external_deps += [ + "cJSON:cjson", + "c_utils:utils", + ] part_name = ace_engine_part } diff --git a/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn b/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn index 8be7db89f33..7652bbd1753 100644 --- a/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn +++ b/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn @@ -213,7 +213,6 @@ ohos_unittest("SpringChainTest") { deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code", - "$cjson_root:cjson", "//third_party/googletest:gtest_main", ] @@ -229,7 +228,10 @@ ohos_unittest("SpringChainTest") { external_deps = [ "hilog:libhilog" ] } - external_deps += [ "c_utils:utils" ] + external_deps += [ + "cJSON:cjson", + "c_utils:utils", + ] part_name = ace_engine_part } diff --git a/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn b/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn index cbd3ce7f6be..8bd3bf59bae 100644 --- a/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn +++ b/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn @@ -213,7 +213,6 @@ ohos_unittest("SvgAnimateTest") { deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code", - "$cjson_root:cjson", "//third_party/googletest:gtest_main", ] @@ -228,7 +227,10 @@ ohos_unittest("SvgAnimateTest") { [ "//base/global/resource_management/frameworks/resmgr:global_resmgr" ] } - external_deps += [ "c_utils:utils" ] + external_deps += [ + "cJSON:cjson", + "c_utils:utils", + ] part_name = ace_engine_part } diff --git a/frameworks/core/components/font/BUILD.gn b/frameworks/core/components/font/BUILD.gn index 3315a8b18d6..61b979f90e8 100644 --- a/frameworks/core/components/font/BUILD.gn +++ b/frameworks/core/components/font/BUILD.gn @@ -27,16 +27,4 @@ build_component("font") { "rosen_font_loader.cpp", "rosen_font_manager.cpp", ] - - # using graphcis_2d drawing lib - include_dirs = [ - "//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//foundation/graphic/graphic_2d/rosen/modules/2d_engine", - "//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text", - "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include", - "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src", - "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter", - "//third_party/bounds_checking_function/include", - ] } diff --git a/frameworks/core/components/scene_viewer/BUILD.gn b/frameworks/core/components/scene_viewer/BUILD.gn index 3b7e39245af..255f8e921cf 100644 --- a/frameworks/core/components/scene_viewer/BUILD.gn +++ b/frameworks/core/components/scene_viewer/BUILD.gn @@ -24,10 +24,7 @@ config("scene_viewer_component_config") { } build_component("scene_viewer") { - configs = [ - ":scene_viewer_component_config", - "//commonlibrary/c_utils/base:utils_config", - ] + configs = [ ":scene_viewer_component_config" ] sources = [ "render_scene_viewer.cpp", diff --git a/frameworks/core/components/text_overlay/BUILD.gn b/frameworks/core/components/text_overlay/BUILD.gn index 615cd8449d0..d06aef29453 100755 --- a/frameworks/core/components/text_overlay/BUILD.gn +++ b/frameworks/core/components/text_overlay/BUILD.gn @@ -49,7 +49,7 @@ build_component("text_overlay_for_web") { external_deps = [] if (is_ohos_standard_system) { - deps = [ "//third_party/openGLES:libGLES" ] + external_deps += [ "opengles:libGLES" ] } rosen_sources = [ "rosen_render_text_overlay.cpp" ] diff --git a/frameworks/core/components/web/BUILD.gn b/frameworks/core/components/web/BUILD.gn index 9e3967098d1..36538277197 100644 --- a/frameworks/core/components/web/BUILD.gn +++ b/frameworks/core/components/web/BUILD.gn @@ -48,7 +48,6 @@ build_component("web") { if (is_ohos_standard_system) { configs = [ ":ohos_web_config" ] - deps = [ "//third_party/openGLES:libGLES" ] external_deps = [ "ability_runtime:abilitykit_native", "ability_runtime:app_manager", @@ -57,6 +56,7 @@ build_component("web") { "init:libbegetutil", "ipc:ipc_core", "napi:ace_napi", + "opengles:libGLES", "webview:libnweb", "window_manager:libwm", ] diff --git a/frameworks/core/components_ng/components.gni b/frameworks/core/components_ng/components.gni index e29ea96916b..e63b5e04c54 100644 --- a/frameworks/core/components_ng/components.gni +++ b/frameworks/core/components_ng/components.gni @@ -103,7 +103,6 @@ template("build_component_ng") { "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src", "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter", "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include/", - "//third_party/bounds_checking_function/include", ] if (enable_graphic_text_gine) { include_dirs += [ "//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text/export" ] @@ -136,8 +135,10 @@ template("build_component_ng") { } external_deps += [ "graphic_2d:librender_service_client" ] if (platform == "ohos" || platform == "ohos_ng") { - deps += [ "//third_party/openGLES:libGLES" ] - external_deps += [ "graphic_2d:2d_graphics" ] + external_deps += [ + "graphic_2d:2d_graphics", + "opengles:libGLES", + ] if (enable_graphic_text_gine) { external_deps += [ "graphic_2d:rosen_text" ] } diff --git a/frameworks/core/components_ng/components_plugin.gni b/frameworks/core/components_ng/components_plugin.gni index 1bc10037f3f..cd70cace9c9 100644 --- a/frameworks/core/components_ng/components_plugin.gni +++ b/frameworks/core/components_ng/components_plugin.gni @@ -107,7 +107,6 @@ template("build_component_plugin") { "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src", "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter", "//foundation/graphic/graphic_2d/rosen/modules", - "//third_party/bounds_checking_function/include", "//foundation/graphic/graphic_2d/rosen/modules/render_service_client/core", "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", ] diff --git a/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.h b/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.h index dc9d339c91f..8c83ab15cba 100644 --- a/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.h +++ b/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.h @@ -19,7 +19,7 @@ #include #include -#include "../linear_layout/linear_layout_property.h" +#include "core/components_ng/pattern/linear_layout/linear_layout_property.h" #include "core/components_ng/base/frame_node.h" #include "core/components_ng/property/property.h" diff --git a/frameworks/core/image/apng/BUILD.gn b/frameworks/core/image/apng/BUILD.gn index d4914b21fa0..3dbfd84f437 100644 --- a/frameworks/core/image/apng/BUILD.gn +++ b/frameworks/core/image/apng/BUILD.gn @@ -22,11 +22,7 @@ template("ace_core_apng_source_set") { defines += invoker.defines #add png support - include_dirs = [ - "$flutter_root/skia/third_party/libpng", - "$flutter_root/skia/third_party/externals/libpng", - "//third_party/zlib", - ] + include_dirs = [ "//third_party/zlib" ] # apng support file sources = [ diff --git a/frameworks/core/image/test/unittest/BUILD.gn b/frameworks/core/image/test/unittest/BUILD.gn index 67363288451..87a3aed1990 100644 --- a/frameworks/core/image/test/unittest/BUILD.gn +++ b/frameworks/core/image/test/unittest/BUILD.gn @@ -191,10 +191,12 @@ ohos_unittest("ImageCompressorTest") { "$ace_root/frameworks/base:ace_base_ohos", "$ace_root/frameworks/base/resource:ace_resource", "//third_party/googletest:gtest_main", - "//third_party/opencl-headers:libcl", ] defines = [ "ENABLE_OPENCL" ] - external_deps = [ "c_utils:utils" ] + external_deps = [ + "c_utils:utils", + "opencl-headers:libcl", + ] part_name = ace_engine_part resource_config_file = "//foundation/arkui/ace_engine/test/resource/graphicalbasicability/ohos_test.xml" } diff --git a/interfaces/inner_api/drawable_descriptor/BUILD.gn b/interfaces/inner_api/drawable_descriptor/BUILD.gn index 66af260bc97..50d51868e1e 100644 --- a/interfaces/inner_api/drawable_descriptor/BUILD.gn +++ b/interfaces/inner_api/drawable_descriptor/BUILD.gn @@ -86,12 +86,10 @@ if (is_arkui_x) { "js_drawable_descriptor.cpp", ] - deps = [ - "$cjson_root:cjson", - "$skia_root_new:skia_ohos", - ] + deps = [ "$skia_root_new:skia_ohos" ] defines = [] external_deps = [ + "cJSON:cjson", "graphic_2d:librender_service_client", "hilog:libhilog", "napi:ace_napi", diff --git a/interfaces/inner_api/form_render/BUILD.gn b/interfaces/inner_api/form_render/BUILD.gn index 5f10cb2ac88..7866264c9b3 100644 --- a/interfaces/inner_api/form_render/BUILD.gn +++ b/interfaces/inner_api/form_render/BUILD.gn @@ -48,7 +48,6 @@ ohos_shared_library("ace_form_render") { configs = [ "$ace_root:ace_config", "$ace_root:ace_coverage_config", - "//commonlibrary/c_utils/base:utils_config", ] public_configs = [ ":form_render_config" ] diff --git a/interfaces/inner_api/ui_service_manager/BUILD.gn b/interfaces/inner_api/ui_service_manager/BUILD.gn index 62a21be6243..9a92ee1c7c8 100755 --- a/interfaces/inner_api/ui_service_manager/BUILD.gn +++ b/interfaces/inner_api/ui_service_manager/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/ability/ability_runtime/ability_runtime.gni") import("//foundation/arkui/ace_engine/ace_config.gni") config("uiservice_manager_public_config") { @@ -20,18 +19,6 @@ config("uiservice_manager_public_config") { include_dirs = [ "$ace_root/frameworks", "include/", - "//drivers/peripheral/base", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client/core", - "//foundation/graphic/graphic_2d/interfaces/innerkits/surface", - "//foundation/graphic/graphic_2d/interfaces/innerkits/common", - "//foundation/graphic/graphic_2d/utils/buffer_handle/export", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include", - "//foundation/window/window_manager/interfaces/innerkits/wm", - "$ability_runtime_innerkits_path/ability_manager/include/", - "$ability_runtime_path/interfaces/kits/native/ability/native", - "$ability_runtime_services_path/uiservicemgr/include", - "//commonlibrary/c_utils/base/include", - "//utils/system/safwk/native/include", ] cflags = [] if (target_cpu == "arm") { @@ -47,22 +34,22 @@ ohos_shared_library("ui_service_mgr") { debug = ace_sanitize_debug } } + sources = [ - "//foundation/arkui/ace_engine/adapter/ohos/services/uiservice/src/ui_service_mgr_client.cpp", - "//foundation/arkui/ace_engine/adapter/ohos/services/uiservice/src/ui_service_mgr_proxy.cpp", - "//foundation/arkui/ace_engine/adapter/ohos/services/uiservice/src/ui_service_proxy.cpp", - "//foundation/arkui/ace_engine/adapter/ohos/services/uiservice/src/ui_service_stub.cpp", + "$ace_root/adapter/ohos/services/uiservice/src/ui_service_mgr_client.cpp", + "$ace_root/adapter/ohos/services/uiservice/src/ui_service_mgr_proxy.cpp", + "$ace_root/adapter/ohos/services/uiservice/src/ui_service_proxy.cpp", + "$ace_root/adapter/ohos/services/uiservice/src/ui_service_stub.cpp", ] configs = [ "$ace_root:ace_config", "$ace_root:ace_coverage_config", - "//commonlibrary/c_utils/base:utils_config", ] public_configs = [ ":uiservice_manager_public_config", - "//foundation/arkui/ace_engine/adapter/ohos/services/uiservice:uiservicems_config", + "$ace_root/adapter/ohos/services/uiservice:uiservicems_config", ] external_deps = [ @@ -71,6 +58,7 @@ ohos_shared_library("ui_service_mgr") { "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", + "window_manager:libwm", ] subsystem_name = ace_engine_subsystem diff --git a/interfaces/native/BUILD.gn b/interfaces/native/BUILD.gn index 991a75aeb5d..3e9ee0c8faa 100644 --- a/interfaces/native/BUILD.gn +++ b/interfaces/native/BUILD.gn @@ -69,9 +69,8 @@ ohos_shared_library("ace_ndk") { "node/style_modifier.cpp", "node/waterflow_section_option.cpp", ] - - deps = [ "//third_party/bounds_checking_function:libsec_shared" ] - + external_deps = [ "bounds_checking_function:libsec_shared" ] + deps = [] cflags_cc = [ "-Wno-missing-braces" ] if (target_os == "ohos") { @@ -84,7 +83,7 @@ ohos_shared_library("ace_ndk") { ":libace_ndk_rom", "$ace_root/interfaces/inner_api/drawable_descriptor:drawable_descriptor", ] - external_deps = [ + external_deps += [ "graphic_2d:native_drawing_ndk", "hilog:libhilog", "image_framework:pixelmap", @@ -116,7 +115,7 @@ if (is_arkui_x) { "native_interface_xcomponent.cpp", ] - deps = [ "$checking_function_root:libsec_static" ] + deps = [ "//third_party/bounds_checking_function:libsec_static" ] cflags_cc = [ "-Wno-missing-braces" ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 2fb095b2732..cf8859138e7 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -107,8 +107,10 @@ ohos_source_set("ace_unittest_trace") { "$ace_root/adapter/ohos/osal/ace_trace.cpp", "$ace_root/frameworks/base/log/ace_trace.cpp", ] - deps = [ "//third_party/bounds_checking_function:libsec_static" ] - external_deps = [ "hitrace:hitrace_meter" ] + external_deps = [ + "bounds_checking_function:libsec_static", + "hitrace:hitrace_meter", + ] configs = [ ":ace_unittest_config" ] } @@ -1081,9 +1083,7 @@ ohos_source_set("ace_components_pattern") { "$ace_root/test/mock/core/pattern/mock_web_pattern.cpp", ] - deps = [ - "$ace_root/frameworks/core/components/theme:build_theme_code", - "//third_party/bounds_checking_function:libsec_static", - ] + deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ] + external_deps = [ "bounds_checking_function:libsec_static" ] configs = [ ":ace_unittest_config" ] } diff --git a/test/unittest/bridge/common/sourcemap/BUILD.gn b/test/unittest/bridge/common/sourcemap/BUILD.gn index 039a3594adc..8debecffbb6 100644 --- a/test/unittest/bridge/common/sourcemap/BUILD.gn +++ b/test/unittest/bridge/common/sourcemap/BUILD.gn @@ -32,6 +32,6 @@ ohos_unittest("bridge_source_map_test") { "$ace_root/test/unittest:ace_base", "$ace_root/test/unittest:ace_components_mock", "$ace_root/test/unittest:ace_core_animation", - "$cjson_root:cjson", ] + external_deps = [ "cJSON:cjson" ] } diff --git a/test/unittest/bridge/common/utils/BUILD.gn b/test/unittest/bridge/common/utils/BUILD.gn index 53029b8a3b7..7d30fc9b97a 100644 --- a/test/unittest/bridge/common/utils/BUILD.gn +++ b/test/unittest/bridge/common/utils/BUILD.gn @@ -31,6 +31,6 @@ ohos_unittest("bridge_utils_test") { "$ace_root/test/unittest:ace_base", "$ace_root/test/unittest:ace_components_mock", "$ace_root/test/unittest:ace_core_animation", - "$cjson_root:cjson", ] + external_deps = [ "cJSON:cjson" ] } diff --git a/test/unittest/core/common/ace_engine/BUILD.gn b/test/unittest/core/common/ace_engine/BUILD.gn index a37a0081f31..20bae69b0b4 100644 --- a/test/unittest/core/common/ace_engine/BUILD.gn +++ b/test/unittest/core/common/ace_engine/BUILD.gn @@ -102,10 +102,9 @@ ohos_unittest("ace_engine_special_test") { "$ace_root/frameworks/base:ace_memory_monitor_ohos", "$ace_root/test/unittest:ace_unittest_log", "$ace_root/test/unittest:ace_unittest_trace", - "$cjson_root:cjson", "//base/startup/init/interfaces/innerkits:libbegetutil", "//third_party/googletest:gmock_main", ] - + external_deps = [ "cJSON:cjson" ] configs = [ "$ace_root/test/unittest:ace_unittest_config" ] } diff --git a/test/unittest/core/common/form/BUILD.gn b/test/unittest/core/common/form/BUILD.gn index 31ebebbd33b..a4ff7c166b8 100644 --- a/test/unittest/core/common/form/BUILD.gn +++ b/test/unittest/core/common/form/BUILD.gn @@ -28,10 +28,10 @@ ohos_unittest("form_manager_test") { deps = [ "$ace_root/frameworks/base:ace_memory_monitor_ohos", "$ace_root/test/unittest:ace_unittest_log", - "$cjson_root:cjson_static", "//third_party/googletest:gmock_main", ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "hilog:libhilog", ] diff --git a/test/unittest/core/common/plugin/BUILD.gn b/test/unittest/core/common/plugin/BUILD.gn index 03c6a5bd31d..853bd59d7fd 100644 --- a/test/unittest/core/common/plugin/BUILD.gn +++ b/test/unittest/core/common/plugin/BUILD.gn @@ -28,10 +28,10 @@ ohos_unittest("plugin_manager_test") { deps = [ "$ace_root/frameworks/base:ace_memory_monitor_ohos", "$ace_root/test/unittest:ace_unittest_log", - "$cjson_root:cjson_static", "//third_party/googletest:gmock_main", ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "hilog:libhilog", ] diff --git a/test/unittest/core/image_provider/BUILD.gn b/test/unittest/core/image_provider/BUILD.gn index 817e517bcff..276f2880004 100644 --- a/test/unittest/core/image_provider/BUILD.gn +++ b/test/unittest/core/image_provider/BUILD.gn @@ -77,10 +77,10 @@ ohos_unittest("image_provider_test_ng") { "$ace_root/test/unittest:ace_engine_unittest_flutter_deps", "$ace_root/test/unittest:ace_unittest_log", "$ace_root/test/unittest:ace_unittest_trace", - "$cjson_root:cjson_static", "$graphic_2d_path/rosen/modules/render_service_base:librender_service_base", "//third_party/googletest:gmock_main", ] + external_deps = [ "cJSON:cjson" ] configs = [ "$ace_root/test/unittest:ace_unittest_config" ] } diff --git a/test/unittest/core/pattern/canvas_renderer/BUILD.gn b/test/unittest/core/pattern/canvas_renderer/BUILD.gn index 8c45087116b..35519d160b7 100644 --- a/test/unittest/core/pattern/canvas_renderer/BUILD.gn +++ b/test/unittest/core/pattern/canvas_renderer/BUILD.gn @@ -89,11 +89,6 @@ config("config_canvas_renderer_test") { include_dirs = [ "$ace_root", "$ace_root/frameworks", - "$flutter_root/skia", - "$flutter_root/engine", - "$flutter_root/engine/flutter", - "$flutter_root/engine/flutter/third_party/txt/src", - "$flutter_root/skia/third_party/externals/harfbuzz/src", ] cflags_cc = [ "-w" ] } diff --git a/test/unittest/core/pattern/plugin/BUILD.gn b/test/unittest/core/pattern/plugin/BUILD.gn index 1a1b50e89e3..cae72e3e562 100644 --- a/test/unittest/core/pattern/plugin/BUILD.gn +++ b/test/unittest/core/pattern/plugin/BUILD.gn @@ -126,9 +126,7 @@ ohos_unittest("plugin_pattern_test_ng") { "$ace_root/interfaces/inner_api/ui_service_manager:ui_service_mgr", "$ace_root/test/unittest:ace_engine_unittest_flutter_deps", "$ace_root/test/unittest:ace_unittest_log", - "$cjson_root:cjson_static", "//third_party/googletest:gmock_main", - "//third_party/zlib:shared_libz", ] if (ace_use_rosen_drawing) { @@ -138,6 +136,7 @@ ohos_unittest("plugin_pattern_test_ng") { } external_deps = [ + "cJSON:cjson", "c_utils:utils", "graphic_2d:librender_service_client", "hilog:libhilog", @@ -148,6 +147,7 @@ ohos_unittest("plugin_pattern_test_ng") { "window_manager:scene_session_manager", "window_manager:screen_session", "window_manager:screen_session_manager_client", + "zlib:shared_libz", ] if (os_account_exists) { diff --git a/test/unittest/core/svg/BUILD.gn b/test/unittest/core/svg/BUILD.gn index 33b43c9c57f..db42cabb83c 100644 --- a/test/unittest/core/svg/BUILD.gn +++ b/test/unittest/core/svg/BUILD.gn @@ -105,6 +105,7 @@ ohos_unittest("parse_test_ng") { ] external_deps = [ + "bounds_checking_function:libsec_static", "eventhandler:libeventhandler", "graphic_2d:librender_service_base", "graphic_2d:librender_service_client", @@ -119,7 +120,6 @@ ohos_unittest("parse_test_ng") { "$ace_root/test/unittest:ace_core_animation", "$ace_root/test/unittest:ace_core_extra", "$skia_root_new:skia_ohos", - "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] @@ -188,6 +188,7 @@ ohos_unittest("svg_dom_test_ng") { ] external_deps = [ + "bounds_checking_function:libsec_static", "eventhandler:libeventhandler", "graphic_2d:librender_service_base", "graphic_2d:librender_service_client", @@ -202,7 +203,6 @@ ohos_unittest("svg_dom_test_ng") { "$ace_root/test/unittest:ace_core_animation", "$ace_root/test/unittest:ace_core_extra", "$skia_root_new:skia_ohos", - "//third_party/bounds_checking_function:libsec_static", "//third_party/googletest:gmock", "//third_party/googletest:gtest_main", ] diff --git a/test/unittest/interfaces/BUILD.gn b/test/unittest/interfaces/BUILD.gn index 9e847976d9c..63e0e5e1d02 100644 --- a/test/unittest/interfaces/BUILD.gn +++ b/test/unittest/interfaces/BUILD.gn @@ -41,7 +41,6 @@ ohos_unittest("ui_content_test") { "$ace_root/test/unittest:ace_engine_unittest_flutter_deps", "$ace_root/test/unittest:ace_unittest_log", "$ace_root/test/unittest:ace_unittest_trace", - "$cjson_root:cjson", "$graphic_2d_path/rosen/modules/render_service_client:librender_service_client", "${ace_root}/interfaces/inner_api/ace:ace_forward_compatibility", "//third_party/googletest:gmock_main", @@ -49,6 +48,7 @@ ohos_unittest("ui_content_test") { external_deps = [ "ability_runtime:abilitykit_native", + "cJSON:cjson", "image_framework:image", "input:libmmi-client", "ipc:ipc_single", @@ -115,7 +115,6 @@ ohos_unittest("form_render_test") { "$ace_root/test/unittest:ace_engine_unittest_flutter_deps", "$ace_root/test/unittest:ace_unittest_log", "$ace_root/test/unittest:ace_unittest_trace", - "$cjson_root:cjson", "$graphic_2d_path/rosen/modules/render_service_client:librender_service_client", "//third_party/googletest:gmock_main", ] @@ -127,6 +126,7 @@ ohos_unittest("form_render_test") { "ability_runtime:runtime", "accessibility:accessibility_common", "ace_engine:ace_uicontent", + "cJSON:cjson", "c_utils:utils", "eventhandler:libeventhandler", "form_fwk:form_manager", @@ -191,7 +191,6 @@ ohos_unittest("form_render_group_test") { "$ace_root/test/unittest:ace_engine_unittest_flutter_deps", "$ace_root/test/unittest:ace_unittest_log", "$ace_root/test/unittest:ace_unittest_trace", - "$cjson_root:cjson", "$graphic_2d_path/rosen/modules/render_service_client:librender_service_client", "//third_party/googletest:gmock_main", ] @@ -203,6 +202,7 @@ ohos_unittest("form_render_group_test") { "ability_runtime:runtime", "accessibility:accessibility_common", "ace_engine:ace_uicontent", + "cJSON:cjson", "c_utils:utils", "eventhandler:libeventhandler", "form_fwk:form_manager", @@ -227,7 +227,6 @@ ohos_unittest("drawable_descriptor_test") { configs = [ "$ace_root/test/unittest:ace_unittest_config" ] deps = [ - "$cjson_root:cjson", "$skia_root_new:skia_ohos", "//third_party/googletest:gmock_main", ] @@ -238,6 +237,7 @@ ohos_unittest("drawable_descriptor_test") { ] external_deps = [ + "cJSON:cjson", "c_utils:utils", "hilog:libhilog", "image_framework:image",