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

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

Update OpenHarmony source repositories to v3.1.1

See merge request eclipse/oniro-core/meta-openharmony!23
parents f4b8a455 6033e484
No related branches found
No related tags found
1 merge request!23Update OpenHarmony source repositories to v3.1.1
Pipeline #5533 passed
...@@ -191,7 +191,7 @@ fetch: ...@@ -191,7 +191,7 @@ fetch:
# there by .bitbake before_script but with an empty string. # there by .bitbake before_script but with an empty string.
- export DISTRO MACHINE - export DISTRO MACHINE
- for DISTRO in oniro-openharmony-linux ; do - for DISTRO in oniro-openharmony-linux ; do
for OPENHARMONY_VERSION in 3.0 3.1 ; do for OPENHARMONY_VERSION in 3.1 3.0 ; do
for MACHINE in qemuarma7 ; do for MACHINE in qemuarma7 ; do
RECIPES="oniro-openharmony-bundle openharmony-standard-image openharmony-standard-image-tests" ; RECIPES="oniro-openharmony-bundle openharmony-standard-image openharmony-standard-image-tests" ;
echo Fetching DISTRO=$DISTRO OPENHARMONY_VERSION=$OPENHARMONY_VERSION MACHINE=$MACHINE RECIPE=$RECIPE ; echo Fetching DISTRO=$DISTRO OPENHARMONY_VERSION=$OPENHARMONY_VERSION MACHINE=$MACHINE RECIPE=$RECIPE ;
...@@ -268,7 +268,7 @@ build: ...@@ -268,7 +268,7 @@ build:
parallel: parallel:
matrix: matrix:
- DISTRO: [oniro-openharmony-linux] - DISTRO: [oniro-openharmony-linux]
OPENHARMONY_VERSION: ["3.0", "3.1"] OPENHARMONY_VERSION: ["3.1", "3.0"]
MACHINE: [qemuarma7] MACHINE: [qemuarma7]
RECIPE: [oniro-openharmony-toolchain, oniro-openharmony-bundle, openharmony-standard-image] RECIPE: [oniro-openharmony-toolchain, oniro-openharmony-bundle, openharmony-standard-image]
artifacts: artifacts:
...@@ -294,7 +294,7 @@ ptest: ...@@ -294,7 +294,7 @@ ptest:
parallel: parallel:
matrix: matrix:
- DISTRO: [oniro-openharmony-linux] - DISTRO: [oniro-openharmony-linux]
OPENHARMONY_VERSION: ["3.0", "3.1"] OPENHARMONY_VERSION: ["3.1", "3.0"]
MACHINE: [qemuarma7] MACHINE: [qemuarma7]
RECIPE: [openharmony-standard-image-tests] RECIPE: [openharmony-standard-image-tests]
artifacts: artifacts:
......
...@@ -8,6 +8,11 @@ DISTRO_VERSION = "1.99.99" ...@@ -8,6 +8,11 @@ DISTRO_VERSION = "1.99.99"
# OpenHarmony OS version # OpenHarmony OS version
OPENHARMONY_VERSION ?= "3.1" OPENHARMONY_VERSION ?= "3.1"
DISTROOVERRIDES:append = ":openharmony-${OPENHARMONY_VERSION}"
OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}"
OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1"
PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}" PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}"
# LLVM/Clang toolchain # LLVM/Clang toolchain
......
...@@ -25,5 +25,20 @@ LDFLAGS:append:toolchain-clang = " ${@bb.utils.contains('COMPILER_RT', '-rtlib=c ...@@ -25,5 +25,20 @@ LDFLAGS:append:toolchain-clang = " ${@bb.utils.contains('COMPILER_RT', '-rtlib=c
#CFLAGS:append:oniro-openharmony-linux = "-DHOOK_ENABLE" #CFLAGS:append:oniro-openharmony-linux = "-DHOOK_ENABLE"
do_install:append:oniro-openharmony-linux () { do_install:append:oniro-openharmony-linux () {
echo "${libdir}/module" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path cat >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path << EOF
${libdir}/module
${libdir}/module/ability
${libdir}/module/account
${libdir}/module/app
${libdir}/module/application
${libdir}/module/bundle
${libdir}/module/data
${libdir}/module/distributedhardware
${libdir}/module/events
${libdir}/module/multimedia
${libdir}/module/multimodalinput
${libdir}/module/net
${libdir}/module/security
${libdir}/module/telephony
EOF
} }
...@@ -13,14 +13,14 @@ Signed-off-by: Thierry Escande <thierry.escande@huawei.com> ...@@ -13,14 +13,14 @@ Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
Upstream-Status: Inappropriate Upstream-Status: Inappropriate
diff --git a/ohos_var.gni b/ohos_var.gni diff --git a/ohos_var.gni b/ohos_var.gni
index 7c14944..40f5ccb 100755 index d2c3569..40f5ccb 100755
--- a/ohos_var.gni --- a/ohos_var.gni
+++ b/ohos_var.gni +++ b/ohos_var.gni
@@ -174,7 +174,7 @@ if (host_os == "mac") { @@ -174,7 +174,7 @@ if (host_os == "mac") {
restool = "//prebuilts/build-tools/common/restool/restool" restool = "//prebuilts/build-tools/common/restool/restool"
} }
-hapsigner = "//prebuilts/signcenter/hapsigntool/hapsigntoolv2.jar" -hapsigner = "//developtools/hapsigner/dist/hap-sign-tool.jar"
+hapsigner = "//../recipe-sysroot-native/usr/lib/hap-sign-tool/hap-sign-tool.jar" +hapsigner = "//../recipe-sysroot-native/usr/lib/hap-sign-tool/hap-sign-tool.jar"
hap_unpacking_tool = "//developtools/packing_tool/jar/app_unpacking_tool.jar" hap_unpacking_tool = "//developtools/packing_tool/jar/app_unpacking_tool.jar"
hap_packing_tool = "//developtools/packing_tool/jar/app_packing_tool.jar" hap_packing_tool = "//developtools/packing_tool/jar/app_packing_tool.jar"
...@@ -29,41 +29,8 @@ index 7c14944..40f5ccb 100755 ...@@ -29,41 +29,8 @@ index 7c14944..40f5ccb 100755
default_signature_algorithm = "SHA256withECDSA" default_signature_algorithm = "SHA256withECDSA"
default_key_alias = "123456" default_key_alias = "123456"
default_keystore_password = "123456" default_keystore_password = "123456"
-default_keystore_path = "//prebuilts/signcenter/key/OpenHarmony.p12" -default_keystore_path = "//developtools/hapsigner/dist/OpenHarmony.p12"
+default_keystore_path = "//../recipe-sysroot-native/usr/lib/hap-sign-tool/OpenHarmony.p12" +default_keystore_path = "//../recipe-sysroot-native/usr/lib/hap-sign-tool/OpenHarmony.p12"
default_hap_certificate_file = default_hap_certificate_file =
- "//prebuilts/signcenter/certificates/OpenHarmonyApplication.pem" - "//developtools/hapsigner/dist/OpenHarmonyApplication.pem"
+ "//../recipe-sysroot-native/usr/lib/hap-sign-tool/OpenHarmonyApplication.pem" + "//../recipe-sysroot-native/usr/lib/hap-sign-tool/OpenHarmonyApplication.pem"
diff --git a/scripts/hapbuilder.py b/scripts/hapbuilder.py
index b78b6f2..1bf4e8a 100755
--- a/scripts/hapbuilder.py
+++ b/scripts/hapbuilder.py
@@ -26,18 +26,17 @@ from util import build_utils # noqa: E402
def sign_hap(hapsigner, private_key_path, sign_algo, certificate_profile,
keystore_path, keystorepasswd, keyalias, certificate_file,
unsigned_hap_path, signed_hap_path):
- cmd = ['java', '-jar', hapsigner, 'sign']
- cmd.extend(['-mode', 'localjks'])
+ cmd = ['java', '-jar', hapsigner, 'sign-app']
+ cmd.extend(['-mode', 'localSign'])
cmd.extend(['-signAlg', sign_algo])
- cmd.extend(['-privatekey', private_key_path])
- cmd.extend(['-inputFile', unsigned_hap_path])
- cmd.extend(['-outputFile', signed_hap_path])
- cmd.extend(['-profile', certificate_profile])
- cmd.extend(['-keystore', keystore_path])
- cmd.extend(['-keystorepasswd', keystorepasswd])
- cmd.extend(['-keyaliaspasswd', keyalias])
- cmd.extend(['-certpath', certificate_file])
- cmd.extend(['-profileSigned', '1'])
+ cmd.extend(['-keyAlias', private_key_path])
+ cmd.extend(['-inFile', unsigned_hap_path])
+ cmd.extend(['-outFile', signed_hap_path])
+ cmd.extend(['-profileFile', certificate_profile])
+ cmd.extend(['-keystoreFile', keystore_path])
+ cmd.extend(['-keystorePwd', keystorepasswd])
+ cmd.extend(['-keyPwd', keyalias])
+ cmd.extend(['-appCertFile', certificate_file])
child = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
...@@ -11,8 +11,8 @@ Upstream-Status: Inappropriate ...@@ -11,8 +11,8 @@ Upstream-Status: Inappropriate
diff --git a/runtime/main/extend/systemplugin/napi/bundle.js b/runtime/main/extend/systemplugin/napi/bundle.js diff --git a/runtime/main/extend/systemplugin/napi/bundle.js b/runtime/main/extend/systemplugin/napi/bundle.js
index d620013d8271..0553b344e8cb 100644 index d620013d8271..0553b344e8cb 100644
--- a/runtime/main/extend/systemplugin/napi/bundle.js --- a/runtime/main/extend/systemplugin/napi/ohos_bundle.js
+++ b/runtime/main/extend/systemplugin/napi/bundle.js +++ b/runtime/main/extend/systemplugin/napi/ohos_bundle.js
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
*/ */
...@@ -33,8 +33,8 @@ index d620013d8271..0553b344e8cb 100644 ...@@ -33,8 +33,8 @@ index d620013d8271..0553b344e8cb 100644
const bundle = { const bundle = {
diff --git a/runtime/main/extend/systemplugin/napi/innerBundleManager.js b/runtime/main/extend/systemplugin/napi/innerBundleManager.js diff --git a/runtime/main/extend/systemplugin/napi/innerBundleManager.js b/runtime/main/extend/systemplugin/napi/innerBundleManager.js
index 72fe60d6f826..408b329d4dee 100644 index 72fe60d6f826..408b329d4dee 100644
--- a/runtime/main/extend/systemplugin/napi/innerBundleManager.js --- a/runtime/main/extend/systemplugin/napi/ohos_bundle_innerBundleManager.js
+++ b/runtime/main/extend/systemplugin/napi/innerBundleManager.js +++ b/runtime/main/extend/systemplugin/napi/ohos_bundle_innerBundleManager.js
@@ -14,7 +14,6 @@ @@ -14,7 +14,6 @@
*/ */
......
...@@ -307,6 +307,7 @@ OPENHARMONY_PARTS += "graphic:graphic_standard" ...@@ -307,6 +307,7 @@ OPENHARMONY_PARTS += "graphic:graphic_standard"
OPENHARMONY_PARTS += "hdf:device_driver_framework" OPENHARMONY_PARTS += "hdf:device_driver_framework"
OPENHARMONY_PARTS += "hdf:hdf" OPENHARMONY_PARTS += "hdf:hdf"
OPENHARMONY_PARTS += "hdf:mocks" OPENHARMONY_PARTS += "hdf:mocks"
OPENHARMONY_PARTS += "hdf:camera_device_driver"
OPENHARMONY_PARTS += "hdf:display_device_driver" OPENHARMONY_PARTS += "hdf:display_device_driver"
OPENHARMONY_PARTS += "hdf:input_device_driver" OPENHARMONY_PARTS += "hdf:input_device_driver"
OPENHARMONY_PARTS += "hdf:sensor_device_driver" OPENHARMONY_PARTS += "hdf:sensor_device_driver"
......
...@@ -10,6 +10,19 @@ not supported by Clang 14. ...@@ -10,6 +10,19 @@ not supported by Clang 14.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com> Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
Upstream-Status: Inappropriate [configuration/integration] Upstream-Status: Inappropriate [configuration/integration]
diff --git a/base/notification/ans_standard/interfaces/kits/napi/ans/src/publish.cpp b/base/notification/ans_standard/interfaces/kits/napi/ans/src/publish.cpp
index b0e575b..dfe8fa8 100644
--- a/base/notification/ans_standard/interfaces/kits/napi/ans/src/publish.cpp
+++ b/base/notification/ans_standard/interfaces/kits/napi/ans/src/publish.cpp
@@ -173,7 +173,7 @@ bool CheckProperty(const napi_env &env, const napi_value &content, const std::st
bool hasProperty = false;
- NAPI_CALL(env, napi_has_named_property(env, content, property.data(), &hasProperty));
+ NAPI_CALL_BOOL(env, napi_has_named_property(env, content, property.data(), &hasProperty));
if (!hasProperty) {
ANS_LOGW("Property %{public}s expected.", property.c_str());
}
diff --git a/base/notification/ans_standard/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp b/base/notification/ans_standard/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp diff --git a/base/notification/ans_standard/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp b/base/notification/ans_standard/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp
index a3ebc189d762..490e8180ed06 100644 index a3ebc189d762..490e8180ed06 100644
--- a/base/notification/ans_standard/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp --- a/base/notification/ans_standard/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp
......
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