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

Merge branch 'fix-native-recipe-warnings' into 'kirkstone'

Fix native class inheritance for devtool recipes

See merge request eclipse/oniro-core/meta-openharmony!31
parents e0f1af31 92dd81be
No related branches found
No related tags found
1 merge request!31Fix native class inheritance for devtool recipes
Pipeline #5973 failed
......@@ -6,8 +6,6 @@ SUMMARY = "HAP signer tool"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
inherit native
S = "${WORKDIR}/src"
SRC_URI = "git://gitee.com/openharmony/developtools_hapsigner.git;protocol=http;branch=OpenHarmony-3.1-Release;rev=ff2cf76f14f7d6c6fa55c9d0f02c4c1eb9c795a9;destsuffix=${S}"
......@@ -33,3 +31,6 @@ do_install() {
install -m 0644 dist/OpenHarmony.p12 ${D}/${DSTDIR}/
install -m 0644 dist/OpenHarmonyApplication.pem ${D}/${DSTDIR}/
}
# native class must be inherited last
inherit native
......@@ -6,7 +6,7 @@ SUMMARY = "OpenHarmony Packing Tool"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=a832eda17114b48ae16cda6a500941c2"
inherit cmake native
inherit cmake
require recipes-openharmony/openharmony/java-tools.inc
......@@ -19,3 +19,6 @@ SRC_URI += "file://fastjson-pkg-name.patch"
# Fetch fastjson-2.0.7.jar package from maven repository. Licensed under Apache 2.0
SRC_URI += "https://search.maven.org/remote_content?g=com.alibaba&a=fastjson&v=2.0.7;unpack=0;subdir=${S}/lib;downloadfilename=fastjson.jar;name=fastjson"
SRC_URI[fastjson.sha256sum] = "902de86ba19b188efca83f3138b1004578882de4306d6e70463dbc89595bf6b7"
# native class must be inherited last
inherit native
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