提交 b64c131f 编写于 作者: H hekun

fix the build.gn

Signed-off-by: Nhekun <hekun18@huawei.com>
上级 cf2d6ef8
...@@ -16,6 +16,8 @@ import("//build/ohos.gni") ...@@ -16,6 +16,8 @@ import("//build/ohos.gni")
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ActsAceXComponentEtsTest") { ohos_js_hap_suite("ActsAceXComponentEtsTest") {
subsystem_name = "arkui"
part_name = "ace_engine"
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":ace_ets_xcomponent_assets", ":ace_ets_xcomponent_assets",
...@@ -33,6 +35,8 @@ ohos_js_hap_suite("ActsAceXComponentEtsTest") { ...@@ -33,6 +35,8 @@ ohos_js_hap_suite("ActsAceXComponentEtsTest") {
ohos_prebuilt_shared_library("libcppsharedso") { ohos_prebuilt_shared_library("libcppsharedso") {
source = rebase_path(libcxx_ndk_shared_file) source = rebase_path(libcxx_ndk_shared_file)
subsystem_name = "arkui"
part_name = "ace_engine"
} }
ohos_js_assets("ace_ets_xcomponent_assets") { ohos_js_assets("ace_ets_xcomponent_assets") {
......
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
import("//build/config/ohos/config.gni") import("//build/config/ohos/config.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
import("//foundation/arkui/napi/napi.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") { config("config") {
visibility = [ ":*" ] visibility = [ ":*" ]
...@@ -35,6 +37,8 @@ ohos_shared_library("nativerender") { ...@@ -35,6 +37,8 @@ ohos_shared_library("nativerender") {
"./render/egl_core.cpp", "./render/egl_core.cpp",
"./render/plugin_render.cpp", "./render/plugin_render.cpp",
] ]
subsystem_name = "arkui"
part_name = "ace_engine"
if (use_musl) { if (use_musl) {
stl = "c++_shared" stl = "c++_shared"
} }
...@@ -43,22 +47,22 @@ ohos_shared_library("nativerender") { ...@@ -43,22 +47,22 @@ ohos_shared_library("nativerender") {
"./common", "./common",
"./napi", "./napi",
"./render", "./render",
"//foundation/arkui/napi/interfaces/inner_api/napi", "$comPath",
"//foundation/arkui/ace_engine/interfaces/native", "$compath3/interfaces/native/kits/include",
"//base/hiviewdfx/hilog/interfaces/native/kits/include",
] ]
configs = [ configs = [
":config", ":config",
"//third_party/EGL:libEGL_public_config", "//third_party/EGL:libEGL_public_config",
"//third_party/openGLES:libGLES_public_config", "//third_party/openGLES:libGLES_public_config",
] ]
external_deps = [
"napi:ace_napi",
]
deps = [ deps = [
"//base/hiviewdfx/hilog/frameworks/hilog_ndk:hilog_ndk", "$compath3/frameworks/hilog_ndk:hilog_ndk",
"//foundation/arkui/ace_engine/interfaces/native:ace_ndk", "$comPath:ace_ndk",
"//foundation/arkui/napi:ace_napi", "$compath2:EGL",
"//foundation/graphic/graphic_2d/frameworks/opengl_wrapper:EGL", "$compath2:GLESv3",
"//foundation/graphic/graphic_2d/frameworks/opengl_wrapper:GLESv3",
] ]
output_extension = "so" output_extension = "so"
......
...@@ -30,15 +30,17 @@ config("public_config") { ...@@ -30,15 +30,17 @@ config("public_config") {
} }
ohos_shared_library("napitest") { ohos_shared_library("napitest") {
subsystem_name = "arkui"
part_name = "napi"
sources = [ "./napi/napi_test.cpp" ] sources = [ "./napi/napi_test.cpp" ]
if (!(product_name == "m40")) { if (!(product_name == "m40")) {
libs = [ rebase_path(libcxx_ndk_shared_file) ] 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" ] configs = [ ":config" ]
deps = [ "//foundation/arkui/napi:ace_napi" ] external_deps = [ "napi:ace_napi" ]
output_extension = "so" output_extension = "so"
} }
...@@ -21,6 +21,8 @@ ohos_static_library("libuvTestStatic") { ...@@ -21,6 +21,8 @@ ohos_static_library("libuvTestStatic") {
"//third_party/libuv/src", "//third_party/libuv/src",
"//third_party/libuv/src/unix", "//third_party/libuv/src/unix",
] ]
part_name = "libuv"
subsystem_name = "thirdparty"
sources = [ sources = [
"//third_party/libuv/test/blackhole-server.c", "//third_party/libuv/test/blackhole-server.c",
"//third_party/libuv/test/echo-server.c", "//third_party/libuv/test/echo-server.c",
...@@ -212,7 +214,7 @@ ohos_moduletest_suite("ActsLibuvTest") { ...@@ -212,7 +214,7 @@ ohos_moduletest_suite("ActsLibuvTest") {
sources = [ "src/ActsLibuvTest.cpp" ] sources = [ "src/ActsLibuvTest.cpp" ]
include_dirs = [ include_dirs = [
"//test/xts/acts/arkui/libuv/src", "../src",
"//third_party/libuv/test", "//third_party/libuv/test",
"//third_party/libuv/include", "//third_party/libuv/include",
"//third_party/libuv/src", "//third_party/libuv/src",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册