From 65c7e29fb7b7849599239566404bc1dcabd0a716 Mon Sep 17 00:00:00 2001
From: "fenghao (P)" <f00501029@china.huawei.com>
Date: Tue, 30 Mar 2021 19:26:15 +0800
Subject: [PATCH] =?UTF-8?q?IssueNo:#I3EADM=20Description:=E8=A7=A3?=
 =?UTF-8?q?=E5=8C=85=E5=B7=A5=E5=85=B7=E6=94=AF=E6=8C=81=E8=A7=A3=E5=8E=8B?=
 =?UTF-8?q?cut=5Fentry.apk=20Sig:aafwk=20Feature=20or=20Bugfix:=20Bugfix?=
 =?UTF-8?q?=20Binary=20Source:=20No?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundles/packing_tool/readme.md     |  2 +-
 com/huawei/ohos/CommandParser.java |  9 +++++++--
 com/huawei/ohos/README             |  1 +
 com/huawei/ohos/Uncompress.java    | 14 ++++++++------
 com/huawei/ohos/Utility.java       |  9 +++++++++
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/bundles/packing_tool/readme.md b/bundles/packing_tool/readme.md
index 3f38c61a..8011c026 100755
--- a/bundles/packing_tool/readme.md
+++ b/bundles/packing_tool/readme.md
@@ -165,7 +165,7 @@ HAP MODE OPTIONS:
   --out-path                     target hap unpackage path.
   --force                        default false; if true, force delete destination
                                  out file if exists.
-
+  --unpack-cut_entry             default false; if true, unpack the cut_entry.apk
 HAR USAGE:
 java -jar hmos_app_unpacking_tool.jar --mode <options> --har-path <option>
 --out-path [option] --force [option]
diff --git a/com/huawei/ohos/CommandParser.java b/com/huawei/ohos/CommandParser.java
index 7351061e..9e263be3 100755
--- a/com/huawei/ohos/CommandParser.java
+++ b/com/huawei/ohos/CommandParser.java
@@ -60,6 +60,7 @@ public class CommandParser {
     private static final String CMD_PARSE_MODE = "--p";
     private static final String CMD_PACK_RES_PATH = "--pack-res-path";
     private static final String CMD_UNPACKAPK = "--unpackapk";
+    private static final String CMD_UNPACK_CUT_ENTRY_APK = "--unpack-cut_entry";
     private static final String CMD_SHAREDLIBS_PATH = "--shared-libs-path";
     private static final String CMD_ENTRYCARD_PATH = "--entrycard-path";
     private static final Log LOG = new Log(CommandParser.class.toString());
@@ -144,7 +145,11 @@ public class CommandParser {
                     i++;
                     break;
                 }
-
+		case CMD_UNPACK_CUT_ENTRY_APK: {
+                    utility.setUnpackCutEntryApk(args[i + 1]);
+                    i++;
+                    break;
+                }
                 case CMD_PACK_INFO_PATH: {
                     utility.setPackInfoPath(args[i + 1]);
                     i++;
@@ -300,4 +305,4 @@ public class CommandParser {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/com/huawei/ohos/README b/com/huawei/ohos/README
index 3e30fa9a..12ca00b9 100755
--- a/com/huawei/ohos/README
+++ b/com/huawei/ohos/README
@@ -166,6 +166,7 @@ HAP MODE OPTIONS:
   --out-path                     target hap unpackage path.
   --force                        default false; if true, force delete destination
                                  out file if exists.
+  --unpack-cut_entry             default false; if true, unpack the cut_entry.apk
 
 HAR USAGE:
 java -jar hmos_app_unpacking_tool.jar --mode <options> --har-path <option>
diff --git a/com/huawei/ohos/Uncompress.java b/com/huawei/ohos/Uncompress.java
index 80d430c3..4dfdf495 100755
--- a/com/huawei/ohos/Uncompress.java
+++ b/com/huawei/ohos/Uncompress.java
@@ -321,12 +321,14 @@ public class Uncompress {
 
                 ZipEntry entry = entries.nextElement();
                 String entryName = "";
-                if (entry != null && !"".equals(entry.getName()) &&
-                        !entry.getName().toLowerCase().endsWith(CUT_ENTRY_FILENAME)) {
-                    entryName = entry.getName();
-                } else {
-                    continue;
+		if (entry == null || entry.getName().isEmpty()) {
+		    continue;
+		}
+                if (entry.getName().toLowerCase().endsWith(CUT_ENTRY_FILENAME) &&
+		    "false".equals(utility.getUnpackCutEntryApk())) {
+		    continue;
                 }
+                entryName = entry.getName();
                 if (!entryName.toLowerCase(Locale.ENGLISH).endsWith(suffix) ||
                         (!hapNames.isEmpty() && !hapNames.contains(entryName.replace(suffix, "")))) {
                     continue;
@@ -1262,4 +1264,4 @@ public class Uncompress {
         }
         return hapFileName.replace(HAP_SUFFIX, "");
     }
-}
\ No newline at end of file
+}
diff --git a/com/huawei/ohos/Utility.java b/com/huawei/ohos/Utility.java
index b1f92589..4b997643 100755
--- a/com/huawei/ohos/Utility.java
+++ b/com/huawei/ohos/Utility.java
@@ -70,6 +70,7 @@ public class Utility {
     private String hapName = "";
     private String sharedLibsPath = "";
     private String unpackApk = "false";
+    private String unpackCutEntryApk = "false";
     private String entryCardPath = "";
     private String packRes = "";
     private String packResPath = "";
@@ -381,6 +382,14 @@ public class Utility {
         this.unpackApk = unpackApk;
     }
 
+    public String getUnpackCutEntryApk() {
+        return unpackCutEntryApk;
+    }
+
+    public void setUnpackCutEntryApk(String unpackCutEntryApk) {
+        this.unpackCutEntryApk = unpackCutEntryApk;
+    }
+
     public String getHapName() {
         return hapName;
     }
-- 
Gitee