Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Xts Acts
提交
ccf88754
X
Xts Acts
项目概览
OpenHarmony
/
Xts Acts
1 年多 前同步成功
通知
9
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
Xts Acts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
ccf88754
编写于
4月 23, 2023
作者:
O
openharmony_ci
提交者:
Gitee
4月 23, 2023
浏览文件
操作
浏览文件
下载
差异文件
!8509 Fix libcxx ndk file path
Merge pull request !8509 from guzhihao4/fix_ndk_build
上级
4f5da29c
bd835959
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
13 addition
and
57 deletion
+13
-57
arkui/ace_ets_xcomponent/BUILD.gn
arkui/ace_ets_xcomponent/BUILD.gn
+2
-7
arkui/ace_napi_test/entry/src/main/cpp/BUILD.gn
arkui/ace_napi_test/entry/src/main/cpp/BUILD.gn
+1
-7
bundlemanager/bundle_standard/bundlemanager/actsbundlenativetest/BUILD.gn
...ndle_standard/bundlemanager/actsbundlenativetest/BUILD.gn
+1
-1
bundlemanager/bundle_standard/bundlemanager/actsbundlenativetest/entry/src/main/cpp/BUILD.gn
...emanager/actsbundlenativetest/entry/src/main/cpp/BUILD.gn
+1
-7
global/global_napi_test/entry/src/main/cpp/BUILD.gn
global/global_napi_test/entry/src/main/cpp/BUILD.gn
+2
-7
hiviewdfx/hilogtest/hilogjstest/src/main/cpp/BUILD.gn
hiviewdfx/hilogtest/hilogjstest/src/main/cpp/BUILD.gn
+1
-7
multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/BUILD.gn
..._js_standard/imagePixelMapNDK/entry/src/main/cpp/BUILD.gn
+2
-7
multimedia/image/image_js_standard/imageReceiverNDK/entry/src/main/cpp/BUILD.gn
..._js_standard/imageReceiverNDK/entry/src/main/cpp/BUILD.gn
+2
-7
multimedia/image/image_js_standard/image_ndk_test/entry/src/main/cpp/BUILD.gn
...ge_js_standard/image_ndk_test/entry/src/main/cpp/BUILD.gn
+1
-7
未找到文件。
arkui/ace_ets_xcomponent/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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") {
...
...
arkui/ace_napi_test/entry/src/main/cpp/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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" ]
...
...
bundlemanager/bundle_standard/bundlemanager/actsbundlenativetest/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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") {
...
...
bundlemanager/bundle_standard/bundlemanager/actsbundlenativetest/entry/src/main/cpp/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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" ]
...
...
global/global_napi_test/entry/src/main/cpp/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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",
...
...
hiviewdfx/hilogtest/hilogjstest/src/main/cpp/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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 = [
...
...
multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/cpp/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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" ]
...
...
multimedia/image/image_js_standard/imageReceiverNDK/entry/src/main/cpp/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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" ]
...
...
multimedia/image/image_js_standard/image_ndk_test/entry/src/main/cpp/BUILD.gn
浏览文件 @
ccf88754
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录