From 092ef811a056bd891d500788e5fcb412ff4e2f8a Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Wed, 10 Mar 2021 15:40:34 +0900 Subject: Fix PackagingBase.CopyDepsToZip CopyDepsToZip() zips direct dependencies with tags implementing PackagingItem interface. Previously, it relied on InstallNeededDependencyTag which has a different meaning. - InstallNeededDependencyTag tells whether a dependency is required to be installed together. - PackagingItem tells whether a dependency (of PackagingBase) is required to be packaged. With the separation of InstallNeededDependencyTag and PackagingItem, PackagingBase module can distinguish cases which were not available before.(I = InstallNeededDependencyTag, P = PackagingItem) a (PackagingBase module) | |`--(I)--> b | |`--(P)--> c --(I)--> d | `--(I/P)--> e a's CopyDepsToZip(): [c, d, e] Test: m nothing (packaging_test) Change-Id: I71fce29b19b0f00dc394981bcf4240e9c1041c7a --- filesystem/filesystem.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 3b0a7ae5a..699402661 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -88,7 +88,7 @@ func filesystemFactory() android.Module { var dependencyTag = struct { blueprint.BaseDependencyTag - android.InstallAlwaysNeededDependencyTag + android.PackagingItemAlwaysDepTag }{} func (f *filesystem) DepsMutator(ctx android.BottomUpMutatorContext) { -- cgit v1.2.3-59-g8ed1b