From 9691d772d5ff4c80437ac2ef85f3604001d41edb Mon Sep 17 00:00:00 2001 From: zzz701 Date: Wed, 10 Sep 2025 18:19:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?NDK=E7=BC=96=E8=AF=91=E5=91=8A=E8=AD=A6sinc?= =?UTF-8?q?e=E6=A0=87=E7=AD=BE=E5=A4=84=E7=90=86=20Signed-off-by:=20zzz701?= =?UTF-8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ohos_adapter/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ohos_adapter/BUILD.gn b/ohos_adapter/BUILD.gn index 22236bb87..e85a98f96 100644 --- a/ohos_adapter/BUILD.gn +++ b/ohos_adapter/BUILD.gn @@ -60,9 +60,8 @@ ohos_shared_library("nweb_ohos_adapter") { ] if (use_hwasan) { - defines += [ - "WEBVIEW_SANDBOX_LIB_PATH_ASAN=\"${asan_webview_sandbox_lib_path}\"", - ] + defines += + [ "WEBVIEW_SANDBOX_LIB_PATH_ASAN=\"${asan_webview_sandbox_lib_path}\"" ] } sources = [ "aafwk_adapter/src/aafwk_app_mgr_client_adapter_impl.cpp", @@ -160,6 +159,7 @@ ohos_shared_library("nweb_ohos_adapter") { if (target_cpu == "arm" || target_cpu == "arm64" || target_cpu == "x86_64") { include_dirs += [ "${current_sdk_home}/native/sysroot/usr/include/bundle", + "${current_sdk_home}/native/sysroot/usr/include/info", "${current_sdk_home}/native/sysroot/usr/include/asset", "${current_sdk_home}/native/sysroot/usr/include/native_drawing", ] @@ -421,6 +421,6 @@ ohos_shared_library("nweb_ohos_adapter") { deps = [ "../ohos_nweb:web_configs", - "//base/web/webview/arkweb_utils:libarkweb_utils" + "//base/web/webview/arkweb_utils:libarkweb_utils", ] } -- Gitee From 78c33ca4b4424f39f2a347e7c58cb57ed71d35c3 Mon Sep 17 00:00:00 2001 From: zzz701 <13747853+zzz701@user.noreply.gitee.com> Date: Wed, 10 Sep 2025 12:39:19 +0000 Subject: [PATCH 2/4] update ohos_adapter/BUILD.gn. Signed-off-by: zzz701 <13747853+zzz701@user.noreply.gitee.com> --- ohos_adapter/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ohos_adapter/BUILD.gn b/ohos_adapter/BUILD.gn index e85a98f96..d528f529b 100644 --- a/ohos_adapter/BUILD.gn +++ b/ohos_adapter/BUILD.gn @@ -159,7 +159,7 @@ ohos_shared_library("nweb_ohos_adapter") { if (target_cpu == "arm" || target_cpu == "arm64" || target_cpu == "x86_64") { include_dirs += [ "${current_sdk_home}/native/sysroot/usr/include/bundle", - "${current_sdk_home}/native/sysroot/usr/include/info", + "${current_sdk_home}/native/sysroot/usr/include", "${current_sdk_home}/native/sysroot/usr/include/asset", "${current_sdk_home}/native/sysroot/usr/include/native_drawing", ] -- Gitee From b1b9e1966e5f157791c99caf38149736194b79a7 Mon Sep 17 00:00:00 2001 From: zzz701 <13747853+zzz701@user.noreply.gitee.com> Date: Wed, 10 Sep 2025 14:11:22 +0000 Subject: [PATCH 3/4] update ohos_adapter/BUILD.gn. Signed-off-by: zzz701 <13747853+zzz701@user.noreply.gitee.com> --- ohos_adapter/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ohos_adapter/BUILD.gn b/ohos_adapter/BUILD.gn index d528f529b..42e6c9b1f 100644 --- a/ohos_adapter/BUILD.gn +++ b/ohos_adapter/BUILD.gn @@ -159,9 +159,9 @@ ohos_shared_library("nweb_ohos_adapter") { if (target_cpu == "arm" || target_cpu == "arm64" || target_cpu == "x86_64") { include_dirs += [ "${current_sdk_home}/native/sysroot/usr/include/bundle", - "${current_sdk_home}/native/sysroot/usr/include", "${current_sdk_home}/native/sysroot/usr/include/asset", "${current_sdk_home}/native/sysroot/usr/include/native_drawing", + "${current_sdk_home}/native/sysroot/usr/include", ] } -- Gitee From f37512b89aa772de203745d503e4e032c760ac6b Mon Sep 17 00:00:00 2001 From: zzz701 <13747853+zzz701@user.noreply.gitee.com> Date: Wed, 10 Sep 2025 15:21:30 +0000 Subject: [PATCH 4/4] update ohos_adapter/BUILD.gn. Signed-off-by: zzz701 <13747853+zzz701@user.noreply.gitee.com> --- ohos_adapter/BUILD.gn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ohos_adapter/BUILD.gn b/ohos_adapter/BUILD.gn index 42e6c9b1f..547583c2b 100644 --- a/ohos_adapter/BUILD.gn +++ b/ohos_adapter/BUILD.gn @@ -161,7 +161,6 @@ ohos_shared_library("nweb_ohos_adapter") { "${current_sdk_home}/native/sysroot/usr/include/bundle", "${current_sdk_home}/native/sysroot/usr/include/asset", "${current_sdk_home}/native/sysroot/usr/include/native_drawing", - "${current_sdk_home}/native/sysroot/usr/include", ] } @@ -423,4 +422,9 @@ ohos_shared_library("nweb_ohos_adapter") { "../ohos_nweb:web_configs", "//base/web/webview/arkweb_utils:libarkweb_utils", ] + if (target_cpu == "arm" || target_cpu == "arm64" || target_cpu == "x86_64") { + include_dirs += [ + "${current_sdk_home}/native/sysroot/usr/include", + ] + } } -- Gitee