From 6c8f00a5f6ad4205fe15dab65a74d8034782a549 Mon Sep 17 00:00:00 2001
From: z30034863 <zhangfengzhuang@huawei.com>
Date: Mon, 16 Jun 2025 15:14:18 +0800
Subject: [PATCH] feature remove minApiVersion check

Signed-off-by: z30034863 <zhangfengzhuang@huawei.com>
---
 README_zh.md                                  | 17 ++++++----
 adapter/ohos/Compressor.java                  |  2 +-
 adapter/ohos/HapVerify.java                   | 32 ++++++++++---------
 .../include/json/hap_verify_utils.h           |  2 +-
 .../frameworks/src/json/hap_verify_utils.cpp  | 25 +++++++++------
 5 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/README_zh.md b/README_zh.md
index df4a106c..e7013447 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -98,9 +98,11 @@ java -jar app_packing_tool.jar --mode app [--hap-path <path>] [--hsp-path <path>
 
 #### 1.3.3 打包app时hap的合法性校验
 
-在对工程内的hap、hsp包打包生成app包时，需要保证被打包的每个hap、hsp在json文件中配置的bundleName，versionCode，minCompatibleVersionCode，minAPIVersion，targetAPIVersion相同，moduleName唯一，对于fa模型，还需要保证json文件中配置的package唯一。hap模块之间需要保证apiReleaseType相同，hsp模块不校验apiReleaseType。
+在打包生成App包时，需要保证被打包的每个HAP和HSP在pack.info/module.json文件中配置的bundleName、bundleType、versionCode、debug相同，moduleName唯一。所有HAP的minCompatibleVersionCode、targetAPIVersion、minAPIVersion保持一致，且分别不低于所有HSP对应字段的最大值。
 
-API 16变更：每个hap在json文件中配置的minCompatibleVersionCode、targetAPIVersion相同，hap在json文件中配置的minCompatibleVersionCode、targetAPIVersion要大于等于hsp在json文件中配置的minCompatibleVersionCode、targetAPIVersion。
+从API version 12开始，App打包不再对versionName校验。
+在API version 16之前，App打包时要求所有HAP/HSP的minCompatibleVersionCode、targetAPIVersion一致。
+在API version 20之前，App打包时要求所有HAP/HSP的minAPIVersion一致。
 #### 1.3.4 打包app时的压缩规则
 
 打包app时，对release模式的hap、hsp包会进行压缩，对debug模式的hap、hsp包不会压缩。
@@ -128,9 +130,11 @@ java -jar app_packing_tool.jar --mode multiApp --hap-list <1.hap,2.hap> --hsp-li
 
 #### 1.4.3 多工程打包hap合法性校验
 
-需要保证被打包的每个hap在json文件中配置的bundleName，versionCode，minCompatibleVersionCode相同，minAPIVersion，targetAPIVersion相同，moduleName唯一，同一设备entry唯一，对于fa模型，还需要保证json文件中配置的package唯一。hap模块之间需要保证apiReleaseType相同，hsp模块不校验apiReleaseType。
+在打包生成App包时，需要保证被打包的每个HAP和HSP在pack.info/module.json文件中配置的bundleName、bundleType、versionCode、debug相同，moduleName唯一。
 
-API 16变更：每个hap在json文件中配置的minCompatibleVersionCode、targetAPIVersion相同，hap在json文件中配置的minCompatibleVersionCode、targetAPIVersion要大于等于hsp在json文件中配置的minCompatibleVersionCode、targetAPIVersion。
+从API version 12开始，多工程打包不再对versionName校验。
+在API version 16之前，App打包时要求所有HAP/HSP的minCompatibleVersionCode、targetAPIVersion一致。
+在API version 20之前，App打包时要求所有HAP/HSP的minAPIVersion一致。
 ### 1.5 hqf模式打包指令
 
 #### 1.5.1 示例
@@ -262,9 +266,10 @@ java -jar app_packing_tool.jar --mode fastApp --hap-path <option> --hsp-path <op
 
 #### 1.10.3 打包app时hap、hsp的合法性校验
 
-在对工程内的hap、hsp包打包生成app包时，需要保证被打包的每个hap、hsp在json文件中配置的bundleName，versionCode，minCompatibleVersionCode，minAPIVersion，targetAPIVersion相同，moduleName唯一。hap模块之间需要保证apiReleaseType相同，hsp模块不校验apiReleaseType。
+在打包生成App包时，需要保证被打包的每个HAP和HSP在pack.info/module.json文件中配置的bundleName、bundleType、versionCode、debug相同，moduleName唯一。所有HAP的minCompatibleVersionCode、targetAPIVersion、minAPIVersion保持一致，且分别不低于所有HSP对应字段的最大值。
 
-API 16变更：每个hap在json文件中配置的minCompatibleVersionCode、targetAPIVersion相同，hap在json文件中配置的minCompatibleVersionCode、targetAPIVersion要大于等于hsp在json文件中配置的minCompatibleVersionCode、targetAPIVersion。
+在API version 16之前，App打包时要求所有HAP/HSP的minCompatibleVersionCode、targetAPIVersion一致。
+在API version 20之前，App打包时要求所有HAP/HSP的minAPIVersion一致。
 ## 2. 拆包指令说明
 
 ### 2.1 hap包模式拆包指令
diff --git a/adapter/ohos/Compressor.java b/adapter/ohos/Compressor.java
index 23c6028c..2b97eba3 100644
--- a/adapter/ohos/Compressor.java
+++ b/adapter/ohos/Compressor.java
@@ -1537,7 +1537,7 @@ public class Compressor {
             packPacJsonFile(utility);
         } catch (BundleException e) {
             LOG.error(PackingToolErrMsg.COMPRESS_APP_FAILED.toString(
-                "Compress app file exist BundleException: " + e.getMessage()));
+          "Compress app file exist BundleException: " + e.getMessage()));
             throw new BundleException("Compress app failed.");
         } finally {
             // delete temp file
diff --git a/adapter/ohos/HapVerify.java b/adapter/ohos/HapVerify.java
index e462b4ba..990a6a1a 100644
--- a/adapter/ohos/HapVerify.java
+++ b/adapter/ohos/HapVerify.java
@@ -285,6 +285,7 @@ class HapVerify {
         List<HapVerifyInfo> hapList = new ArrayList<>();
         int hspMinCompatibleVersionCodeMax = -1;
         int hspTargetApiVersionMax = -1;
+        int hspMinApiVersionMax = -1;
         VerifyCollection verifyCollection = new VerifyCollection();
         verifyCollection.bundleName = verifyInfo.getBundleName();
         verifyCollection.setBundleType(verifyInfo.getBundleType());
@@ -328,16 +329,19 @@ class HapVerify {
                 if (hapVerifyInfo.getApiVersion().getTargetApiVersion() > hspTargetApiVersionMax) {
                     hspTargetApiVersionMax = hapVerifyInfo.getApiVersion().getTargetApiVersion();
                 }
+                if (hapVerifyInfo.getApiVersion().getCompatibleApiVersion() > hspMinApiVersionMax) {
+                    hspMinApiVersionMax = hapVerifyInfo.getApiVersion().getCompatibleApiVersion();
+                }
             }
         }
-        if (!appFieldsIsValid(hapList, hspMinCompatibleVersionCodeMax, hspTargetApiVersionMax)) {
+        if (!appFieldsIsValid(hapList, hspMinCompatibleVersionCodeMax, hspTargetApiVersionMax, hspMinApiVersionMax)) {
             return false;
         }
         return true;
     }
 
     private static boolean appFieldsIsValid(List<HapVerifyInfo> hapVerifyInfos, int minCompatibleVersionCode,
-        int targetApiVersion) {
+        int targetApiVersion, int minApiVersion) {
         if (hapVerifyInfos.isEmpty()) {
             LOG.warning("Hap verify infos is empty");
             return true;
@@ -345,20 +349,23 @@ class HapVerify {
         HapVerifyInfo hap = hapVerifyInfos.get(0);
         for (HapVerifyInfo hapInfo : hapVerifyInfos) {
             if (hap.getVersion().minCompatibleVersionCode != hapInfo.getVersion().minCompatibleVersionCode ||
-                hap.getApiVersion().getTargetApiVersion() != hapInfo.getApiVersion().getTargetApiVersion()) {
-                String errMsg = "Hap minCompatibleVersionCode or targetApiVersion different.";
+                hap.getApiVersion().getTargetApiVersion() != hapInfo.getApiVersion().getTargetApiVersion() ||
+                hap.getApiVersion().getCompatibleApiVersion() != hapInfo.getApiVersion().getCompatibleApiVersion()) {
+                String errMsg = "Hap minCompatibleVersionCode or targetApiVersion or minApiVersion different.";
                 String solution = "Ensure that the values of 'minCompatibleVersionCode' and 'targetApiVersion' " +
-                        "in the module.json file of each HAP module are the same.";
+                        "and 'minApiVersion' in the module.json file of each HAP module are the same.";
                 LOG.error(PackingToolErrMsg.CHECK_APP_FIELDS_INVALID.toString(errMsg, solution));
                 return false;
             }
         }
         if (hap.getVersion().minCompatibleVersionCode < minCompatibleVersionCode ||
-            hap.getApiVersion().getTargetApiVersion() < targetApiVersion) {
-            String cause = "The values of minCompatibleVersionCode or targetApiVersion in the module.json file " +
-                    "of the HAP module are smaller than those of the HSP module.";
-            String solution = "Ensure that the values of aminCompatibleVersionCode and targetApiVersion in the " +
-                    "module.json file of the HAP module are greater than or equal to those of the HSP module.";
+            hap.getApiVersion().getTargetApiVersion() < targetApiVersion ||
+            hap.getApiVersion().getCompatibleApiVersion() < minApiVersion) {
+            String cause = "The values of minCompatibleVersionCode or targetApiVersion or minApiVersion in the" +
+                    " module.json file of the HAP module are smaller than those of the HSP module.";
+            String solution = "Ensure that the values of aminCompatibleVersionCode and targetApiVersion" +
+                    " and minApiVersion in the module.json file of the HAP module" +
+                    " are greater than or equal to those of the HSP module.";
             LOG.error(PackingToolErrMsg.CHECK_APP_FIELDS_INVALID.toString(cause, solution));
             return false;
         }
@@ -385,11 +392,6 @@ class HapVerify {
             LOG.error(PackingToolErrMsg.APP_FIELDS_DIFFERENT_ERROR.toString(errMsg, solution));
             return false;
         }
-        if (verifyCollection.compatibleApiVersion != hapVerifyInfo.getApiVersion().getCompatibleApiVersion()) {
-            String errMsg = "The minApiVersion parameter values are different.";
-            String solution = "Check if the minApiVersion is the same in different modules.";
-            LOG.error(PackingToolErrMsg.APP_FIELDS_DIFFERENT_ERROR.toString(errMsg, solution));
-        }
         if (!verifyCollection.releaseType.equals(hapVerifyInfo.getApiVersion().getReleaseType())) {
             if (verifyCollection.getModuleType().equals(TYPE_SHARED) ||
                     hapVerifyInfo.getModuleType().equals(TYPE_SHARED)) {
diff --git a/packing_tool/frameworks/include/json/hap_verify_utils.h b/packing_tool/frameworks/include/json/hap_verify_utils.h
index 5821ece7..aecc7d13 100644
--- a/packing_tool/frameworks/include/json/hap_verify_utils.h
+++ b/packing_tool/frameworks/include/json/hap_verify_utils.h
@@ -137,7 +137,7 @@ private:
     static bool CheckContinueTypeIsValid(const HapVerifyInfo& hapVerifyInfo);
     static bool CheckContinueTypeIsValid(const HapVerifyInfo& hapVerifyInfo1, const HapVerifyInfo& hapVerifyInfo2);
     static bool AppFieldsIsValid(const std::list<HapVerifyInfo>& hapVerifyInfos,
-        int32_t minCompatibleVersionCode, int32_t targetApiVersion);
+        int32_t minCompatibleVersionCode, int32_t targetApiVersion, int32_t minApiVersion);
     static bool AppAssetAccessGroupsIsSame(const std::list<std::string>& assetAccessGroups,
         const HapVerifyInfo& hapVerifyInfo);
 };
diff --git a/packing_tool/frameworks/src/json/hap_verify_utils.cpp b/packing_tool/frameworks/src/json/hap_verify_utils.cpp
index 743c4571..6d226b1a 100644
--- a/packing_tool/frameworks/src/json/hap_verify_utils.cpp
+++ b/packing_tool/frameworks/src/json/hap_verify_utils.cpp
@@ -131,6 +131,7 @@ bool HapVerifyUtils::CheckAppFieldsIsSame(const std::list<HapVerifyInfo>& hapVer
     std::list<HapVerifyInfo> hapList;
     int32_t hspMinCompatibleVersionCodeMax = -1;
     int32_t hspTargetApiVersionMax = -1;
+    int32_t hspMinApiVersionMax = -1;
     HapVerifyInfo hapVerifyInfo = *hapVerifyInfos.begin();
     VerifyCollection verifyCollection;
     verifyCollection.bundleName = hapVerifyInfo.GetBundleName();
@@ -179,16 +180,19 @@ bool HapVerifyUtils::CheckAppFieldsIsSame(const std::list<HapVerifyInfo>& hapVer
             if (hapVerifyInfo.GetApiVersion().targetApiVersion > hspTargetApiVersionMax) {
                 hspTargetApiVersionMax = hapVerifyInfo.GetApiVersion().targetApiVersion;
             }
+            if (hapVerifyInfo.GetApiVersion().compatibleApiVersion > hspMinApiVersionMax) {
+                hspMinApiVersionMax = hapVerifyInfo.GetApiVersion().compatibleApiVersion;
+            }
         }
     }
-    if (!AppFieldsIsValid(hapList, hspMinCompatibleVersionCodeMax, hspTargetApiVersionMax)) {
+    if (!AppFieldsIsValid(hapList, hspMinCompatibleVersionCodeMax, hspTargetApiVersionMax, hspMinApiVersionMax)) {
         return false;
     }
     return true;
 }
 
 bool HapVerifyUtils::AppFieldsIsValid(const std::list<HapVerifyInfo>& hapVerifyInfos,
-    int32_t minCompatibleVersionCode, int32_t targetApiVersion)
+    int32_t minCompatibleVersionCode, int32_t targetApiVersion, int32_t minApiVersion)
 {
     if (hapVerifyInfos.empty()) {
         LOGW("hapList empty");
@@ -197,14 +201,16 @@ bool HapVerifyUtils::AppFieldsIsValid(const std::list<HapVerifyInfo>& hapVerifyI
     HapVerifyInfo hap = *hapVerifyInfos.begin();
     for (const HapVerifyInfo& hapInfo : hapVerifyInfos) {
         if (hap.GetVersion().minCompatibleVersionCode != hapInfo.GetVersion().minCompatibleVersionCode ||
-            hap.GetApiVersion().targetApiVersion != hapInfo.GetApiVersion().targetApiVersion) {
-            LOGE("hap minCompatibleVersionCode or targetApiVersion different");
+            hap.GetApiVersion().targetApiVersion != hapInfo.GetApiVersion().targetApiVersion ||
+            hap.GetApiVersion().compatibleApiVersion != hapInfo.GetApiVersion().compatibleApiVersion) {
+            LOGE("hap minCompatibleVersionCode or targetApiVersion or minApiVersion different");
             return false;
         }
     }
     if (hap.GetVersion().minCompatibleVersionCode < minCompatibleVersionCode ||
-        hap.GetApiVersion().targetApiVersion < targetApiVersion) {
-        LOGE("minCompatibleVersionCode or targetApiVersion property hap less than hsp");
+        hap.GetApiVersion().targetApiVersion < targetApiVersion ||
+        hap.GetApiVersion().compatibleApiVersion < minApiVersion) {
+        LOGE("minCompatibleVersionCode or targetApiVersion or minApiVersion property hap less than hsp");
         return false;
     }
     return true;
@@ -228,10 +234,9 @@ bool HapVerifyUtils::AppFieldsIsSame(const VerifyCollection& verifyCollection, c
         LOGE("input module versionCode is different.");
         return false;
     }
-    if (verifyCollection.compatibleApiVersion != hapVerifyInfo.GetApiVersion().compatibleApiVersion ||
-        verifyCollection.releaseType != hapVerifyInfo.GetApiVersion().releaseType) {
-        LOGE("input module compatibleApiVersion or releaseType is different.");
-        LOGE("Solutions: > Check if the compatibleApiVersion / releaseType" \
+    if (verifyCollection.releaseType != hapVerifyInfo.GetApiVersion().releaseType) {
+        LOGE("input module releaseType is different.");
+        LOGE("Solutions: > Check if the releaseType" \
             " is the same in different modules.");
         return false;
     }
-- 
Gitee