From 48b0c66dc7c0dc455730d0d340193a6a7d87930c Mon Sep 17 00:00:00 2001
From: RingKing <1300547600@qq.com>
Date: Fri, 12 Jan 2024 08:50:31 +0000
Subject: [PATCH 1/3] Added parsing of the visibility field in bundle.json

Signed-off-by: RingKing <1300547600@qq.com>
---
 hb/util/loader/load_ohos_build.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hb/util/loader/load_ohos_build.py b/hb/util/loader/load_ohos_build.py
index d30241aa67..e7fffabe04 100644
--- a/hb/util/loader/load_ohos_build.py
+++ b/hb/util/loader/load_ohos_build.py
@@ -224,6 +224,8 @@ class PartObject(object):
                         format(part_name), "2014")
                 info['header_base'] = header_base
                 info['header_files'] = header.get('header_files')
+                if header.get('visibility') is not None:
+                    info['visibility'] = header.get('visibility')
             _libs_info[lib_name] = info
         self._inner_kits_info = _libs_info
 
-- 
Gitee


From 744c9b2786429539c91c56fa6cc8bb238bede843 Mon Sep 17 00:00:00 2001
From: RingKing <1300547600@qq.com>
Date: Sat, 13 Jan 2024 06:30:57 +0000
Subject: [PATCH 2/3] --amend

Signed-off-by: RingKing <1300547600@qq.com>
---
 hb/util/loader/load_ohos_build.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hb/util/loader/load_ohos_build.py b/hb/util/loader/load_ohos_build.py
index e7fffabe04..2aac987a48 100644
--- a/hb/util/loader/load_ohos_build.py
+++ b/hb/util/loader/load_ohos_build.py
@@ -198,6 +198,9 @@ class PartObject(object):
             lib_name = label.split(':')[1]
             info['label'] = label
             info['name'] = lib_name
+            vis = inner_kits_lib.get('visibility')
+            if vis is not None:
+                info['visibility'] = vis
             lib_type = inner_kits_lib.get('type')
             if lib_type is None:
                 lib_type = 'so'
@@ -224,8 +227,6 @@ class PartObject(object):
                         format(part_name), "2014")
                 info['header_base'] = header_base
                 info['header_files'] = header.get('header_files')
-                if header.get('visibility') is not None:
-                    info['visibility'] = header.get('visibility')
             _libs_info[lib_name] = info
         self._inner_kits_info = _libs_info
 
-- 
Gitee


From 0ae7109767448913f8b458a9b798a9b393547543 Mon Sep 17 00:00:00 2001
From: RingKing <1300547600@qq.com>
Date: Mon, 15 Jan 2024 07:15:52 +0000
Subject: [PATCH 3/3] --amend

Signed-off-by: RingKing <1300547600@qq.com>
---
 hb/util/loader/load_ohos_build.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hb/util/loader/load_ohos_build.py b/hb/util/loader/load_ohos_build.py
index 2aac987a48..95146bfc0a 100644
--- a/hb/util/loader/load_ohos_build.py
+++ b/hb/util/loader/load_ohos_build.py
@@ -198,9 +198,8 @@ class PartObject(object):
             lib_name = label.split(':')[1]
             info['label'] = label
             info['name'] = lib_name
-            vis = inner_kits_lib.get('visibility')
-            if vis is not None:
-                info['visibility'] = vis
+            if inner_kits_lib.get('visibility') is not None:
+                info['visibility'] = inner_kits_lib.get('visibility')
             lib_type = inner_kits_lib.get('type')
             if lib_type is None:
                 lib_type = 'so'
-- 
Gitee