From 7b5532ff202211cc1347e06ddc85d4d0973bb84f Mon Sep 17 00:00:00 2001
From: unknown <zhaoyuan17@huawei.com>
Date: Thu, 9 Sep 2021 11:37:38 +0800
Subject: [PATCH] fix build.gn

Signed-off-by: unknown <zhaoyuan17@huawei.com>
---
 BUILD.gn     | 115 ++++++++++++++++++++++++++++++++++++++++++++++++---
 jar/BUILD.gn |  24 +++++++++++
 2 files changed, 133 insertions(+), 6 deletions(-)
 create mode 100644 jar/BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index b4f4157e..0e82b411 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -11,14 +11,117 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build/config/ohos/rules.gni")
 import("//build/ohos.gni")
+import("//developtools/developtools.gni")
 
-ohos_prebuilt_etc("app_packing_tool") {
-  source = "jar/hmos_app_packing_tool.jar"
-  install_enable = false
+java_library("hmos_app_packing_tool_java") {
+  java_files = [
+    "adapter/ohos/BundleException.java",
+    "adapter/ohos/CommandParser.java",
+    "adapter/ohos/CompressEntrance.java",
+    "adapter/ohos/Compressor.java",
+    "adapter/ohos/CompressVerify.java",
+    "adapter/ohos/Log.java",
+    "adapter/ohos/ShowHelp.java",
+    "adapter/ohos/Utility.java",
+  ]
+
+  main_class = "ohos.CompressEntrance"
+
+  final_jar_path = "$root_build_dir/developtools/hmos_app_packing_tool.jar"
+}
+
+java_library("hmos_app_unpacking_tool_java") {
+  java_files = [
+    "adapter/ohos/BundleException.java",
+    "adapter/ohos/CommandParser.java",
+    "adapter/ohos/Log.java",
+    "adapter/ohos/ShowHelp.java",
+    "adapter/ohos/UncompressEntrance.java",
+    "adapter/ohos/Uncompress.java",
+    "adapter/ohos/UncompressVerify.java",
+    "adapter/ohos/Utility.java",
+    "adapter/ohos/HapInfo.java",
+    "adapter/ohos/ReqPermission.java",
+    "adapter/ohos/Distro.java",
+    "adapter/ohos/AbilityInfo.java",
+    "adapter/ohos/MetaData.java",
+    "adapter/ohos/MetaDataInfo.java",
+    "adapter/ohos/SkillInfo.java",
+    "adapter/ohos/UsedScene.java",
+    "adapter/ohos/PackInfo.java",
+    "adapter/ohos/FormInfo.java",
+    "adapter/ohos/ProfileInfo.java",
+    "adapter/ohos/AppInfo.java",
+    "adapter/ohos/DefPermission.java",
+    "adapter/ohos/DefPermissionGroup.java",
+    "adapter/ohos/CustomizeData.java",
+    "adapter/ohos/UncomperssResult.java",
+    "adapter/ohos/JsonUtil.java",
+    "adapter/ohos/JsInfo.java",
+    "adapter/ohos/DeviceConfig.java",
+    "adapter/ohos/CommonEvent.java",
+    "adapter/ohos/Shortcut.java",
+    "adapter/ohos/IntentInfo.java",
+    "adapter/ohos/ResourcesParser.java",
+    "adapter/ohos/DistroFilter.java",
+    "adapter/ohos/ApiVersion.java",
+    "adapter/ohos/ScreenShape.java",
+    "adapter/ohos/ScreenDensity.java",
+    "adapter/ohos/ScreenWindow.java",
+    "adapter/ohos/CountryCode.java",
+    "adapter/ohos/HapZipInfo.java",
+  ]
+
+  deps = [ "//third_party/fastjson/repackaged:fastjson_utils_java" ]
+
+  java_manifest_file = "META-INF/unpacking_tool/MANIFEST.MF"
+
+  main_class = "ohos.UncompressEntrance"
+
+  final_jar_path = "$root_build_dir/developtools/hmos_app_unpacking_tool.jar"
+}
+
+java_library("hmos_haptobin_tool_java") {
+  java_files = [
+    "adapter/ohos/Log.java",
+    "adapter/ohos/BinaryTool.java",
+    "adapter/ohos/FileUtils.java",
+    "adapter/ohos/ConvertHapToBin.java",
+  ]
+
+  deps = [ "//third_party/fastjson/repackaged:fastjson_utils_java" ]
+
+  java_manifest_file = "META-INF/packingbin_tool/MANIFEST.MF"
+
+  main_class = "ohos.ConvertHapToBin"
+
+  final_jar_path = "$root_build_dir/developtools/hmos_haptobin_tool.jar"
+}
+
+java_library("hmos_bininfo_collecting_tool_java") {
+  java_files = [
+    "adapter/ohos/Log.java",
+    "adapter/ohos/FileUtils.java",
+    "adapter/ohos/CollectBinInfo.java",
+  ]
+
+  deps = [ "//third_party/fastjson/repackaged:fastjson_utils_java" ]
+
+  java_manifest_file = "META-INF/collectingbininfo_tool/MANIFEST.MF"
+
+  main_class = "ohos.CollectBinInfo"
+
+  final_jar_path =
+      "$root_build_dir/developtools/hmos_bininfo_collecting_tool.jar"
 }
 
-ohos_prebuilt_etc("app_unpacking_tool") {
-  source = "jar/hmos_app_unpacking_tool.jar"
-  install_enable = false
+group("packing_tool_target") {
+  deps = [
+    ":hmos_app_packing_tool_java",
+    ":hmos_app_unpacking_tool_java",
+    ":hmos_bininfo_collecting_tool_java",
+    ":hmos_haptobin_tool_java",
+  ]
 }
diff --git a/jar/BUILD.gn b/jar/BUILD.gn
new file mode 100644
index 00000000..ea9e578f
--- /dev/null
+++ b/jar/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+
+ohos_prebuilt_etc("app_packing_tool") {
+  source = "hmos_app_packing_tool.jar"
+  install_enable = false
+}
+
+ohos_prebuilt_etc("app_unpacking_tool") {
+  source = "hmos_app_unpacking_tool.jar"
+  install_enable = false
+}
-- 
Gitee