Skip to content
Snippets Groups Projects
Commit eb5bc16e authored by Thierry Escande's avatar Thierry Escande
Browse files

Merge branch 'openharmony-3.0.1-update' into 'kirkstone'

Update source repositories to v3.0.1

See merge request eclipse/oniro-core/meta-openharmony!27
parents d55a0810 363a6da2
No related branches found
No related tags found
1 merge request!27Update source repositories to v3.0.1
Pipeline #5886 passed
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
OPENHARMONY_VERSION ?= "3.1" OPENHARMONY_VERSION ?= "3.1"
OPENHARMONY_OVERRIDES = "openharmony-${OPENHARMONY_VERSION}:openharmony" OPENHARMONY_OVERRIDES = "openharmony-${OPENHARMONY_VERSION}:openharmony"
OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}" OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}"
OPENHARMONY_VERSION_FULL:openharmony-3.0 = "3.0.1"
OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1" OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1"
PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}" PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}"
...@@ -12,7 +12,7 @@ Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com> ...@@ -12,7 +12,7 @@ Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
Upstream-Status: Inappropriate [configuration/integration] Upstream-Status: Inappropriate [configuration/integration]
diff --git a/third_party/icu/icu4c/BUILD.gn b/third_party/icu/icu4c/BUILD.gn diff --git a/third_party/icu/icu4c/BUILD.gn b/third_party/icu/icu4c/BUILD.gn
index 892733e53e2c..dbb9b4cddb3f 100755 index 86daba5..0c8d9d5 100755
--- a/third_party/icu/icu4c/BUILD.gn --- a/third_party/icu/icu4c/BUILD.gn
+++ b/third_party/icu/icu4c/BUILD.gn +++ b/third_party/icu/icu4c/BUILD.gn
@@ -509,10 +509,12 @@ ohos_shared_library("shared_icuuc") { @@ -509,10 +509,12 @@ ohos_shared_library("shared_icuuc") {
...@@ -29,22 +29,26 @@ index 892733e53e2c..dbb9b4cddb3f 100755 ...@@ -29,22 +29,26 @@ index 892733e53e2c..dbb9b4cddb3f 100755
ldflags = [ ldflags = [
"-shared", "-shared",
"-lm", "-lm",
@@ -552,11 +554,13 @@ ohos_shared_library("shared_icui18n") { @@ -552,12 +554,16 @@ ohos_shared_library("shared_icui18n") {
"-Wpointer-arith", "-Wpointer-arith",
"-Wno-error=unused-parameter", "-Wno-error=unused-parameter",
"-Wno-error=unused-const-variable", "-Wno-error=unused-const-variable",
- "-Wno-error=implicit-float-conversion",
- "-Wno-error=unneeded-internal-declaration", - "-Wno-error=unneeded-internal-declaration",
"-Wwrite-strings", "-Wwrite-strings",
"-std=c++11", "-std=c++11",
"-Wno-ignored-attributes", "-Wno-ignored-attributes",
] ]
+ if (is_clang) { + if (is_clang) {
+ cflags_cc += [ "-Wno-error=unneeded-internal-declaration" ] + cflags_cc += [
+ "-Wno-error=unneeded-internal-declaration",
+ "-Wno-error=implicit-float-conversion",
+ ]
+ } + }
ldflags = [ ldflags = [
"-shared", "-shared",
"-ldl", "-ldl",
@@ -599,11 +603,13 @@ ohos_static_library("static_icuuc") { @@ -600,11 +606,13 @@ ohos_static_library("static_icuuc") {
"-std=c++11", "-std=c++11",
"-Wno-error=unused-parameter", "-Wno-error=unused-parameter",
"-Wno-error=unused-const-variable", "-Wno-error=unused-const-variable",
...@@ -59,10 +63,11 @@ index 892733e53e2c..dbb9b4cddb3f 100755 ...@@ -59,10 +63,11 @@ index 892733e53e2c..dbb9b4cddb3f 100755
cflags = [ cflags = [
"-fvisibility=hidden", "-fvisibility=hidden",
@@ -649,12 +655,14 @@ ohos_static_library("static_icui18n") { @@ -649,13 +657,17 @@ ohos_static_library("static_icui18n") {
"-Wwrite-strings", "-Wwrite-strings",
"-Wno-error=unused-parameter", "-Wno-error=unused-parameter",
"-Wno-error=unused-const-variable", "-Wno-error=unused-const-variable",
- "-Wno-error=implicit-float-conversion",
- "-Wno-error=unneeded-internal-declaration", - "-Wno-error=unneeded-internal-declaration",
"-std=c++11", "-std=c++11",
"-fvisibility-inlines-hidden", "-fvisibility-inlines-hidden",
...@@ -70,11 +75,14 @@ index 892733e53e2c..dbb9b4cddb3f 100755 ...@@ -70,11 +75,14 @@ index 892733e53e2c..dbb9b4cddb3f 100755
"-Wno-ignored-attributes", "-Wno-ignored-attributes",
] ]
+ if (is_clang) { + if (is_clang) {
+ cflags_cc += [ "-Wno-error=unneeded-internal-declaration" ] + cflags_cc += [
+ "-Wno-error=unneeded-internal-declaration",
+ "-Wno-error=implicit-float-conversion",
+ ]
+ } + }
cflags = [ if (is_mingw) {
"-fvisibility=hidden", cflags_cc += [ "-DWINVER=0x0601" ]
diff --git a/third_party/icu/icu4c/source/BUILD.gn b/third_party/icu/icu4c/source/BUILD.gn diff --git a/third_party/icu/icu4c/source/BUILD.gn b/third_party/icu/icu4c/source/BUILD.gn
index c93a43ef248e..de8af91f4a75 100644 index c93a43ef248e..de8af91f4a75 100644
--- a/third_party/icu/icu4c/source/BUILD.gn --- a/third_party/icu/icu4c/source/BUILD.gn
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment