diff --git a/arkui/ace_ets_xcomponent/BUILD.gn b/arkui/ace_ets_xcomponent/BUILD.gn index f6f39b1148f290da6c96f332a31030d24b4aac68..17b93d95527f57fa757919762bfadd100ba321f7 100644 --- a/arkui/ace_ets_xcomponent/BUILD.gn +++ b/arkui/ace_ets_xcomponent/BUILD.gn @@ -16,6 +16,8 @@ import("//build/ohos.gni") import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAceXComponentEtsTest") { + subsystem_name = "arkui" + part_name = "ace_engine" hap_profile = "./entry/src/main/config.json" deps = [ ":ace_ets_xcomponent_assets", @@ -33,6 +35,8 @@ ohos_js_hap_suite("ActsAceXComponentEtsTest") { ohos_prebuilt_shared_library("libcppsharedso") { source = rebase_path(libcxx_ndk_shared_file) + subsystem_name = "arkui" + part_name = "ace_engine" } ohos_js_assets("ace_ets_xcomponent_assets") { diff --git a/arkui/ace_ets_xcomponent/entry/src/main/cpp/BUILD.gn b/arkui/ace_ets_xcomponent/entry/src/main/cpp/BUILD.gn index 9b5d4089fe5c5bfd30b8959f16e88913f36b68f6..5593a3ef2c3dbd921b556919e7805de74c84387c 100644 --- a/arkui/ace_ets_xcomponent/entry/src/main/cpp/BUILD.gn +++ b/arkui/ace_ets_xcomponent/entry/src/main/cpp/BUILD.gn @@ -13,7 +13,9 @@ import("//build/config/ohos/config.gni") import("//build/ohos.gni") import("//foundation/arkui/napi/napi.gni") - +comPath = "../../../../../../../../../foundation/arkui/ace_engine/interfaces/native" +compath2 = "../../../../../../../../../foundation/graphic/graphic_2d/frameworks/opengl_wrapper" +compath3 = "../../../../../../../../../base/hiviewdfx/hilog" config("config") { visibility = [ ":*" ] @@ -35,6 +37,8 @@ ohos_shared_library("nativerender") { "./render/egl_core.cpp", "./render/plugin_render.cpp", ] + subsystem_name = "arkui" + part_name = "ace_engine" if (use_musl) { stl = "c++_shared" } @@ -43,22 +47,22 @@ ohos_shared_library("nativerender") { "./common", "./napi", "./render", - "//foundation/arkui/napi/interfaces/inner_api/napi", - "//foundation/arkui/ace_engine/interfaces/native", - "//base/hiviewdfx/hilog/interfaces/native/kits/include", + "$comPath", + "$compath3/interfaces/native/kits/include", ] configs = [ ":config", "//third_party/EGL:libEGL_public_config", "//third_party/openGLES:libGLES_public_config", ] - + external_deps = [ + "napi:ace_napi", + ] deps = [ - "//base/hiviewdfx/hilog/frameworks/hilog_ndk:hilog_ndk", - "//foundation/arkui/ace_engine/interfaces/native:ace_ndk", - "//foundation/arkui/napi:ace_napi", - "//foundation/graphic/graphic_2d/frameworks/opengl_wrapper:EGL", - "//foundation/graphic/graphic_2d/frameworks/opengl_wrapper:GLESv3", + "$compath3/frameworks/hilog_ndk:hilog_ndk", + "$comPath:ace_ndk", + "$compath2:EGL", + "$compath2:GLESv3", ] output_extension = "so" diff --git a/arkui/ace_napi_test/entry/src/main/cpp/BUILD.gn b/arkui/ace_napi_test/entry/src/main/cpp/BUILD.gn index 23c0887abe45391ab379779bf5bf3b3406392a80..1ea509e38c3eb55075abf9e6d27cd9e613591435 100644 --- a/arkui/ace_napi_test/entry/src/main/cpp/BUILD.gn +++ b/arkui/ace_napi_test/entry/src/main/cpp/BUILD.gn @@ -30,15 +30,17 @@ config("public_config") { } ohos_shared_library("napitest") { + subsystem_name = "arkui" + part_name = "napi" sources = [ "./napi/napi_test.cpp" ] if (!(product_name == "m40")) { libs = [ rebase_path(libcxx_ndk_shared_file) ] } - include_dirs = [ "//test/xts/acts/arkui/ace_napi_test/entry/src/main/cpp" ] + include_dirs = [ "../cpp" ] configs = [ ":config" ] - deps = [ "//foundation/arkui/napi:ace_napi" ] + external_deps = [ "napi:ace_napi" ] output_extension = "so" } diff --git a/arkui/libuv/BUILD.gn b/arkui/libuv/BUILD.gn index b087ed13df22cebf10c64de0ef723f55532d97ff..2b3a84d29f4ef13a54409434a4d58d10bd83e32a 100644 --- a/arkui/libuv/BUILD.gn +++ b/arkui/libuv/BUILD.gn @@ -21,6 +21,8 @@ ohos_static_library("libuvTestStatic") { "//third_party/libuv/src", "//third_party/libuv/src/unix", ] + part_name = "libuv" + subsystem_name = "thirdparty" sources = [ "//third_party/libuv/test/blackhole-server.c", "//third_party/libuv/test/echo-server.c", @@ -212,7 +214,7 @@ ohos_moduletest_suite("ActsLibuvTest") { sources = [ "src/ActsLibuvTest.cpp" ] include_dirs = [ - "//test/xts/acts/arkui/libuv/src", + "../src", "//third_party/libuv/test", "//third_party/libuv/include", "//third_party/libuv/src",