!17 修复嵌入式环境下无法识别的编译选项以及gn升级适配

From: @s-c-c 
Reviewed-by: @yukaii 
Signed-off-by: @yukaii

0003-feat-for-embedded-remove-c99-designator-cflags.patch

@@ -0,0 +1,27 @@
+From 5d1b0af28b71f3cea09a0e593182daaf9c8ea71f Mon Sep 17 00:00:00 2001
+From: s_c_c <shichuchao@huawei.com>
+Date: Fri, 28 Jun 2024 16:48:59 +0800
+Subject: [PATCH] feat for embedded remove c99 designator cflags
+
+---
+ interfaces/inner_api/dataability/BUILD.gn | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/interfaces/inner_api/dataability/BUILD.gn b/interfaces/inner_api/dataability/BUILD.gn
+index bd4c5c4..26778ec 100644
+--- a/interfaces/inner_api/dataability/BUILD.gn
++++ b/interfaces/inner_api/dataability/BUILD.gn
+@@ -16,8 +16,8 @@ import("//foundation/distributeddatamgr/relational_store/relational_store.gni")
+ config("native_dataability_config") {
+   visibility = [ ":*" ]
+ 
+-  cflags = [ "-Wc99-designator" ]
+-  cflags_cc = [ "-Wc99-designator" ]
++#   cflags = [ "-Wc99-designator" ]
++#   cflags_cc = [ "-Wc99-designator" ]
+   include_dirs = [
+     "include",
+     "${relational_store_native_path}/dataability/include",
+-- 
+2.45.2.windows.1
+

0004-Fix-public_config-visibility-for-gn.patch

@@ -0,0 +1,39 @@
+From 698b8973524e96fdc090fc5ae49ccb659d25adca Mon Sep 17 00:00:00 2001
+From: shichuchao <shichuchao@huawei.com>
+Date: Tue, 20 Aug 2024 10:56:31 +0800
+Subject: [PATCH] Fix public_config visibility for gn
+
+---
+ interfaces/inner_api/dataability/BUILD.gn | 2 +-
+ interfaces/inner_api/rdb/BUILD.gn         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/interfaces/inner_api/dataability/BUILD.gn b/interfaces/inner_api/dataability/BUILD.gn
+index 26778ec..2534d3e 100644
+--- a/interfaces/inner_api/dataability/BUILD.gn
++++ b/interfaces/inner_api/dataability/BUILD.gn
+@@ -26,7 +26,7 @@ config("native_dataability_config") {
+ }
+ 
+ config("native_dataability_public_config") {
+-  visibility = [ "//foundation/distributeddatamgr/relational_store:*" ]
++  visibility = [ ":*" ]
+   include_dirs = [ "include" ]
+ }
+ 
+diff --git a/interfaces/inner_api/rdb/BUILD.gn b/interfaces/inner_api/rdb/BUILD.gn
+index 603e3dc..5c42da0 100644
+--- a/interfaces/inner_api/rdb/BUILD.gn
++++ b/interfaces/inner_api/rdb/BUILD.gn
+@@ -62,7 +62,7 @@ config("native_rdb_config") {
+ }
+ 
+ config("native_rdb_public_config") {
+-  visibility = [ "//foundation/distributeddatamgr/relational_store:*" ]
++  visibility = [ ":*" ]
+ 
+   if (is_mingw || is_mac) {
+     include_dirs = [
+-- 
+2.28.0.windows.1
+

appdatafwk.BUILD.gn

@@ -1,7 +1,8 @@
 import("//build/ohos.gni")
+import("//build/config/sysroot.gni")
 
 config("appdatafwk_public_config") {
-  include_dirs = [ "include" ]
+  include_dirs = [ "${sysroot}/usr/include/relational_store/" ]
   libs = [ "native_appdatafwk.z" ]
 }
 

dataability.BUILD.gn

@@ -1,7 +1,8 @@
 import("//build/ohos.gni") 
+import("//build/config/sysroot.gni")
 
 config("native_dataability_public_config") {
-  include_dirs = [ "include" ] 
+  include_dirs = [ "${sysroot}/usr/include/relational_store/" ] 
   libs = [ "native_dataability.z" ]
 }
 

distributeddatamgr_relational_store.spec

@@ -6,7 +6,7 @@
 
 Name:       distributeddatamgr_relational_store
 Version:    1.0.0
-Release:    3
+Release:    5
 Summary:    Local Relational Data Management from OpenHarmony
 License:    Apache-2.0
 Url:        https://gitee.com/openharmony/distributeddatamgr_relational_store
@@ -18,6 +18,8 @@ Source5:    share.adapter.BUILD.gn
 Source6:    rdb.BUILD.gn
 Patch1:     0001-remove-useless-dependencies.patch 
 Patch2:     0002-establish-relational-store-dependence-on-boundscheck.patch
+Patch3:     0003-feat-for-embedded-remove-c99-designator-cflags.patch
+Patch4:     0004-Fix-public_config-visibility-for-gn.patch
 
 BuildRequires: libboundscheck, libicu-devel, libxml2-devel
 BuildRequires: distributed-build, hilog, commonlibrary_c_utils
@@ -50,6 +52,8 @@ mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/relationa
 
 %patch -P1 -p1 -d %{distributeddata_dir}/relational_store
 %patch -P2 -p1 -d %{_builddir}/foundation
+%patch -P3 -p1 -d %{distributeddata_dir}/relational_store
+%patch -P4 -p1 -d %{distributeddata_dir}/relational_store
 
 %build
 %ifarch x86_64
@@ -111,6 +115,12 @@ popd
 /system/*
 
 %changelog
+* Tue Aug 20 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-5
+- Fix public_config visibility for gn.
+
+* Fri Jun 28 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-4
+- Remove c99 designator unrecognized option and fix sysroot for embedded.
+
 * Tue Nov 21 2023 Peng He <hepeng68@huawei.com> - 1.0.0-3
 - Update build requires and requires.
 

rdb.BUILD.gn

@@ -1,8 +1,9 @@
 import("//build/ohos.gni")
+import("//build/config/sysroot.gni")
 
 config("native_rdb_public_config") {
   include_dirs = [
-    "include"
+    "${sysroot}/usr/include/relational_store/"
   ]
   libs = [ "native_rdb.z" ]
 }