Only add apex_info for compressed apexes
Test: mm -j dist, then make sure apex_info.pb doesn't contain
non-compressed apex
Change-Id: I6262eb97ec53de28953257d8b3b77e32ac0259be
diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py
index 7ccc95c..8ebfb4b 100644
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -458,6 +458,15 @@
target_dir = os.path.join(tmp_dir, "SYSTEM/apex/")
apex_infos = []
+
+ debugfs_path = "debugfs"
+ if OPTIONS.search_path:
+ debugfs_path = os.path.join(OPTIONS.search_path, "bin", "debugfs_static")
+ deapexer = 'deapexer'
+ if OPTIONS.search_path:
+ deapexer_path = os.path.join(OPTIONS.search_path, "deapexer")
+ if os.path.isfile(deapexer_path):
+ deapexer = deapexer_path
for apex_filename in os.listdir(target_dir):
apex_filepath = os.path.join(target_dir, apex_filename)
if not os.path.isfile(apex_filepath) or \
@@ -470,14 +479,6 @@
apex_info.package_name = manifest.name
apex_info.version = manifest.version
# Check if the file is compressed or not
- debugfs_path = "debugfs"
- if OPTIONS.search_path:
- debugfs_path = os.path.join(OPTIONS.search_path, "bin", "debugfs_static")
- deapexer = 'deapexer'
- if OPTIONS.search_path:
- deapexer_path = os.path.join(OPTIONS.search_path, "deapexer")
- if os.path.isfile(deapexer_path):
- deapexer = deapexer_path
apex_type = RunAndCheckOutput([
deapexer, "--debugfs_path", debugfs_path,
'info', '--print-type', apex_filepath]).rstrip()
@@ -498,6 +499,6 @@
'--output', decompressed_file_path])
apex_info.decompressed_size = os.path.getsize(decompressed_file_path)
- apex_infos.append(apex_info)
+ apex_infos.append(apex_info)
return apex_infos