summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dennis Song <denniscy@google.com> 2023-08-04 07:08:17 +0000
committer Dennis Song <denniscy@google.com> 2023-08-04 07:08:17 +0000
commita380533f135fb7925ef8ef4fac3c87634cb75b4c (patch)
treefb43eec59735faaf58216400e763348a7a78c56c
parent196c70bf23829dd691d8ad0978bbd911a53fe207 (diff)
Remove system_dlkm from _FRAMEWORK_PARTITIONS
system_dlkm partition is related to GKI, so it should be in the same category as boot image. Test: merge_target_files \ --path otatools \ --framework-target-files framework-target_files.zip \ --vendor-target-files vendor-target_files.zip \ --output-target-files merged-target_files.zip Bug: 294482075 Change-Id: Ie8f60d72f44d31e1bc3b556735b92ed0a2fda662
-rw-r--r--tools/releasetools/merge/merge_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/releasetools/merge/merge_utils.py b/tools/releasetools/merge/merge_utils.py
index b5683a854a..d446fc020d 100644
--- a/tools/releasetools/merge/merge_utils.py
+++ b/tools/releasetools/merge/merge_utils.py
@@ -217,7 +217,7 @@ def ItemListToPartitionSet(item_list):
# Partitions that are grabbed from the framework partial build by default.
_FRAMEWORK_PARTITIONS = {
- 'system', 'product', 'system_ext', 'system_other', 'root', 'system_dlkm',
+ 'system', 'product', 'system_ext', 'system_other', 'root',
'vbmeta_system', 'pvmfw'
}