From 8c9c2a2ac7ba3ac3d7796211539f3b15e8cb3cc1 Mon Sep 17 00:00:00 2001
From: zhangqing <zhangqing50@h-partners.com>
Date: Wed, 19 Mar 2025 16:28:05 +0800
Subject: [PATCH] arkui-x update master OH to weekly_20250317 and OH fix build
 bug

Signed-off-by: zhangqing <zhangqing50@h-partners.com>
Change-Id: I8947b423c0bc0e3b7e5128d904d90e57d199635e
---
 BUILD.gn                            | 13 +++++++++++--
 libexif/huawei/mnote-huawei-entry.c |  1 +
 libexif/huawei/mnote-huawei-entry.h |  1 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 23a0c10..087c7c6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -92,7 +92,12 @@ if (defined(ohos_lite)) {  # is on lite Os for ipcamera
   ohos_source_set("exif_static") {
     subsystem_name = "thirdparty"
     part_name = "libexif"
-    external_deps = [ "bounds_checking_function:libsec_shared" ]
+
+    if (is_arkui_x) {  # Arkui_x not sopported external_deps
+      deps = [ "//third_party/bounds_checking_function:libsec_static" ]
+    } else {
+      external_deps = [ "bounds_checking_function:libsec_shared" ]
+    }
     branch_protector_ret = "pac_ret"
     sources = [
       "//third_party/libexif/libexif/apple/exif-mnote-data-apple.c",
@@ -147,7 +152,11 @@ if (defined(ohos_lite)) {  # is on lite Os for ipcamera
   ohos_shared_library("libexif") {
     branch_protector_ret = "pac_ret"
     deps = [ ":exif_static" ]
-    external_deps = [ "bounds_checking_function:libsec_shared" ]
+    if (is_arkui_x) {
+      deps += [ "//third_party/bounds_checking_function:libsec_static" ]
+    } else {
+      external_deps = [ "bounds_checking_function:libsec_shared" ]
+    }
     public_configs = [ ":build_public_config" ]
     install_images = [ system_base_dir ]
     subsystem_name = "thirdparty"
diff --git a/libexif/huawei/mnote-huawei-entry.c b/libexif/huawei/mnote-huawei-entry.c
index f8730ec..3501d94 100644
--- a/libexif/huawei/mnote-huawei-entry.c
+++ b/libexif/huawei/mnote-huawei-entry.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <securec.h>
 #include <math.h>
 
 #include <libexif/exif-format.h>
diff --git a/libexif/huawei/mnote-huawei-entry.h b/libexif/huawei/mnote-huawei-entry.h
index e5f4546..c42b914 100644
--- a/libexif/huawei/mnote-huawei-entry.h
+++ b/libexif/huawei/mnote-huawei-entry.h
@@ -19,7 +19,6 @@
 #include <libexif/exif-format.h>
 #include <libexif/exif-byte-order.h>
 #include <libexif/huawei/mnote-huawei-tag.h>
-#include <securec.h>
 
 typedef struct _MnoteHuaweiEntry        MnoteHuaweiEntry;
 typedef struct _ExifMnoteDataHuawei     ExifMnoteDataHuawei;
-- 
Gitee