diff options
| -rw-r--r-- | apex/apex.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apex/apex.go b/apex/apex.go index 9c2c679a0..0bca09394 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1151,8 +1151,8 @@ const ( zipApexType = "zip" flattenedApexType = "flattened" - ext4FsType = "ext4" - f2fsFsType = "f2fs" + ext4FsType = "ext4" + f2fsFsType = "f2fs" erofsFsType = "erofs" ) @@ -1683,6 +1683,9 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { if _, ok := depTag.(android.ExcludeFromApexContentsTag); ok { return false } + if mod, ok := child.(android.Module); ok && !mod.Enabled() { + return false + } depName := ctx.OtherModuleName(child) if _, isDirectDep := parent.(*apexBundle); isDirectDep { switch depTag { |