From e6a0c4af74228a32616921ab8ebf57388f0e9b6e Mon Sep 17 00:00:00 2001
From: chenqun1 <chenqun27@huawei.com>
Date: Fri, 16 Sep 2022 17:06:53 +0800
Subject: [PATCH] =?UTF-8?q?hapsigntool=20jar=E5=8C=85=E5=8F=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: chenqun1 <chenqun27@huawei.com>
---
 BUILD.gn            | 10 +++++++---
 build_hap.sh        | 15 +++++++++++++++
 hapsigner_build.gni | 16 ++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 build_hap.sh
 create mode 100644 hapsigner_build.gni

diff --git a/BUILD.gn b/BUILD.gn
index 0577cdaf..1f34a79a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -13,6 +13,13 @@
 
 import("//build/ohos.gni")
 import("//build/ohos/ace/ace.gni")
+import("//developtools/hapsigner/hapsigner_build.gni")
+
+action_package_jar("hap_build"){
+  _target_label = get_label_info(":${target_name}", "label_with_toolchain")
+  var = get_label_info(_target_label, "target_out_dir") 
+  outputs = [ "${target_out_dir}/lib/jar/hap-sign-tool.jar" ]
+}
 
 ohos_copy("lib") {
   if (build_public_version) {
@@ -22,10 +29,7 @@ ohos_copy("lib") {
       "dist/OpenHarmonyProfileRelease.pem",
       "dist/UnsgnedDebugProfileTemplate.json",
       "dist/UnsgnedReleasedProfileTemplate.json",
-      "dist/hap-sign-tool.jar",
     ]
-  } else {
-    sources = "dist/hap-sign-tool.jar"
   }
   outputs = [ target_out_dir + "/$target_name/{{source_file_part}}" ]
 }
diff --git a/build_hap.sh b/build_hap.sh
new file mode 100644
index 00000000..e68a07b2
--- /dev/null
+++ b/build_hap.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+var=$1
+get_build_catalogue="cd ../../developtools/hapsigner/hapsigntool"
+eval ${get_build_catalogue}
+build_command="gradle build"
+eval ${build_command}
+cp_command="cp hap_sign_tool/build/libs/hap-sign-tool.jar  ../../../${var:2}/lib/jar/hap-sign-tool.jar"
+eval ${cp_command}
+
+
+
+
+
+
diff --git a/hapsigner_build.gni b/hapsigner_build.gni
new file mode 100644
index 00000000..d89afd35
--- /dev/null
+++ b/hapsigner_build.gni
@@ -0,0 +1,16 @@
+template("action_package_jar") {
+    _target_label = get_label_info(":${target_name}", "label_with_toolchain")
+    var =  get_label_info(_target_label, "target_out_dir")
+    action(target_name) {
+        forward_variables_from(
+            invoker,
+            [
+                 "outputs"
+            ])
+        script = "//developtools/hapsigner/build_hap.sh"
+        args = [
+          var,  
+          rebase_path(outputs[0], root_out_dir),
+        ]
+    }
+}
-- 
Gitee