Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7efadf94 authored by Dennis Song's avatar Dennis Song Committed by Automerger Merge Worker
Browse files

Merge "Remove system_dlkm from _FRAMEWORK_PARTITIONS" into main am: 1afb7ffe... 

Merge "Remove system_dlkm from _FRAMEWORK_PARTITIONS" into main am: 1afb7ffe am: 1183d106 am: f1c3de61

Original change: https://android-review.googlesource.com/c/platform/build/+/2694247



Change-Id: I160231b8393ae332760cc3d522c3eb2a6e6de14d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 541d3e7e f1c3de61

tools/releasetools/merge/merge_utils.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -217,7 +217,7 @@ def ItemListToPartitionSet(item_list): 




# Partitions that are grabbed from the framework partial build by default.

# Partitions that are grabbed from the framework partial build by default.

_FRAMEWORK_PARTITIONS = {

_FRAMEWORK_PARTITIONS = {

    'system', 'product', 'system_ext', 'system_other', 'root', 'system_dlkm',

    'system', 'product', 'system_ext', 'system_other', 'root',

    'vbmeta_system', 'pvmfw'

    'vbmeta_system', 'pvmfw'

}

}