openharmony-standard: Replace prebuilt packing-tool binaries

This replaces the use of prebuilt packing tools with the ones built from
the recipe packing-tool-native.

The patch for the OpenHarmony build repository fixes the path to the
packing tool jar files and now points to the ones in the recipe native
sysroot.

Signed-off-by: Thierry Escande <thierry.escande@huawei.com>

recipes-openharmony/openharmony/openharmony-standard-3.1/build_packing-tool-path.patch

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+Patch for //build git repository of OpenHarmony 3.1 codebase.
+
+This modifies the path to the OpenHarmony packing tool jar files so
+rebase_path() points to the bitbake brewed ones in the native sysroot.
+
+Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
+Upstream-Status: Inappropriate
+
+diff --git a/ohos_var.gni b/ohos_var.gni
+index 40f5ccb..85766a0 100755
+--- a/ohos_var.gni
++++ b/ohos_var.gni
+@@ -175,8 +175,8 @@ if (host_os == "mac") {
+ }
+ 
+ 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_packing_tool = "//developtools/packing_tool/jar/app_packing_tool.jar"
++hap_unpacking_tool = "//../recipe-sysroot-native/usr/lib/app_unpacking_tool.jar"
++hap_packing_tool = "//../recipe-sysroot-native/usr/lib/app_packing_tool.jar"
+ nodejs_version = "v12.18.4"
+ if (host_os == "mac") {
+   nodejs = "//prebuilts/build-tools/common/nodejs/node-${nodejs_version}-darwin-x64/bin/node"

recipes-openharmony/openharmony/openharmony-standard-sources-3.1.inc

@@ -206,10 +206,6 @@ SRC_URI += "${GITEE_URL}/utils.git;protocol=https;nobranch=1;branch=OpenHarmony-
 SRC_URI += "${GITEE_URL}/utils_native.git;protocol=https;nobranch=1;branch=OpenHarmony-v3.1-Release;rev=72b83a79b468d8aa2b4efa4bf040583d87577897;destsuffix=${OH_SRCDIR}/utils/native"
 SRC_URI += "${GITEE_URL}/resources.git;protocol=https;nobranch=1;branch=OpenHarmony-v3.1-Release;rev=f3079ef097ec279f026ab84e62fb1af645654ad6;destsuffix=${OH_SRCDIR}/utils/resources"
 
-# Prebuilt HAP signing tool
-### CONTAINS BINARIES. NEED TO BE BUILT FROM SOURCES INSTEAD ###
-SRC_URI += "${GITEE_URL}/developtools_packing_tool.git;protocol=https;nobranch=1;branch=OpenHarmony-v3.1-Release;rev=e44a0c2f2ec99bcefee75285258dc5e90582cd6f;destsuffix=${OH_SRCDIR}/developtools/packing_tool"
-
 SRC_URI += "https://repo.huaweicloud.com/harmonyos/compiler/restool/2.007/restool-2.007.tar.gz;name=restool;subdir=${OH_SRCDIR}/prebuilts/build-tools/common"
 SRC_URI[restool.sha256sum] = "4cd763315d80ceecbde5f64f20252d7edf89f0083ac7c1794b12fbe556a9b826"
 

recipes-openharmony/openharmony/openharmony-standard_3.1.bb

@@ -16,6 +16,7 @@ DEPENDS += "nodejs-native"
 DEPENDS += "bison-native"
 DEPENDS += "ruby-native"
 DEPENDS += "hapsigner-native"
+DEPENDS += "packing-tool-native"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/openharmony-${OPENHARMONY_VERSION}:"
 FILESEXTRAPATHS:prepend := "${THISDIR}/openharmony-standard-${OPENHARMONY_VERSION}:"
@@ -49,6 +50,7 @@ SRC_URI += "file://ace-js2bundle_node-path.patch;patchdir=${S}/developtools/ace-
 SRC_URI += "file://hc-gen-compiler.patch;patchdir=${S}/drivers/framework"
 SRC_URI += "file://build_node-path.patch;patchdir=${S}/build"
 SRC_URI += "file://build_hapsigner-tool.patch;patchdir=${S}/build"
+SRC_URI += "file://build_packing-tool-path.patch;patchdir=${S}/build"
 SRC_URI += "file://third_party_fsck_msdos.patch;patchdir=${S}/third_party/fsck_msdos"
 SRC_URI += "file://third_party_libinput.patch;patchdir=${S}/third_party/libinput"
 SRC_URI += "file://third_party_lz4.patch;patchdir=${S}/third_party/lz4"