未验证 提交 ccf88754 编写于 作者: O openharmony_ci 提交者: Gitee

!8509 Fix libcxx ndk file path

Merge pull request !8509 from guzhihao4/fix_ndk_build
......@@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/config/ohos/config.gni")
import("//build/ohos.gni")
import("//test/xts/tools/build/suite.gni")
......@@ -31,13 +32,7 @@ ohos_js_hap_suite("ActsAceXComponentEtsTest") {
}
ohos_prebuilt_shared_library("libcppsharedso") {
if (target_cpu == "arm") {
source = "//prebuilts/clang/ohos/linux-x86_64/libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so"
} else if (target_cpu == "arm64") {
source = "//prebuilts/clang/ohos/linux-x86_64/libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so"
} else {
source = " "
}
source = rebase_path(libcxx_ndk_shared_file)
}
ohos_js_assets("ace_ets_xcomponent_assets") {
......
......@@ -32,13 +32,7 @@ config("public_config") {
ohos_shared_library("napitest") {
sources = [ "./napi/napi_test.cpp" ]
if (!(product_name == "m40")) {
if (target_cpu == "arm") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
} else if (target_cpu == "arm64") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
} else {
libs = []
}
libs = [ rebase_path(libcxx_ndk_shared_file) ]
}
include_dirs = [ "//test/xts/acts/arkui/ace_napi_test/entry/src/main/cpp" ]
......
......@@ -32,7 +32,7 @@ ohos_js_hap_suite("ActsBundleNativeTest") {
}
ohos_prebuilt_shared_library("libcppsharedso") {
source = "//prebuilts/clang/ohos/linux-x86_64/libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so"
source = rebase_path(libcxx_ndk_shared_file)
}
ohos_js_assets("ace_third_ets_assets") {
......
......@@ -31,13 +31,7 @@ config("public_config") {
ohos_shared_library("bundlendk") {
sources = [ "./bundlendk.cpp" ]
if (!(product_name == "m40")) {
if (target_cpu == "arm") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
} else if (target_cpu == "arm64") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
} else {
libs = []
}
libs = [ rebase_path(libcxx_ndk_shared_file) ]
}
include_dirs = [ "//test/xts/acts/bundlemanager/bundle_standard/bundlemanager/actsbundlenativetest/entry/src/main/cpp" ]
......
......@@ -31,13 +31,8 @@ config("public_config") {
ohos_shared_library("resmgrndk") {
sources = [ "./napi/global_napi_test.cpp" ]
if (target_cpu == "arm") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
} else if (target_cpu == "arm64") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
} else {
libs = []
}
libs = [ rebase_path(libcxx_ndk_shared_file) ]
include_dirs = [
"//base/global/resource_management/interfaces/native/resource/include",
"//test/xts/acts/arkui/ace_napi_test/entry/src/main/cpp",
......
......@@ -32,13 +32,7 @@ config("public_config") {
ohos_shared_library("hilogndk") {
sources = [ "./hilogndk.cpp" ]
if (!(product_name == "m40")) {
if (target_cpu == "arm") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
} else if (target_cpu == "arm64") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
} else {
libs = []
}
libs = [ rebase_path(libcxx_ndk_shared_file) ]
}
include_dirs = [
......
......@@ -28,13 +28,8 @@ config("config") {
ohos_shared_library("ImagePixelMapNDKTest") {
sources = [ "./napi/image_pixel_map_imgndk_test.cpp" ]
if (target_cpu == "arm") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
} else if (target_cpu == "arm64") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
} else {
libs = []
}
libs = [ rebase_path(libcxx_ndk_shared_file) ]
include_dirs = [ "../cpp" ]
configs = [ ":config" ]
......
......@@ -28,13 +28,8 @@ config("config") {
ohos_shared_library("ImageReceiverNDKTest") {
sources = [ "./napi/image_receiver_mdk_test.cpp" ]
if (target_cpu == "arm") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
} else if (target_cpu == "arm64") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
} else {
libs = []
}
libs = [ rebase_path(libcxx_ndk_shared_file) ]
include_dirs = [ "../cpp" ]
configs = [ ":config" ]
......
......@@ -32,13 +32,7 @@ config("public_config") {
ohos_shared_library("imagePixelmap") {
sources = [ "./napi/imagePixelmap.cpp" ]
if (use_musl) {
if (target_cpu == "arm") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
} else if (target_cpu == "arm64") {
libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
} else {
libs = []
}
libs = [ rebase_path(libcxx_ndk_shared_file) ]
}
include_dirs = [ "//test/xts/acts/multimedia/image/image_js_standard/image_ndk_test/entry/src/main/cpp" ]
configs = [ ":config" ]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册