diff options
author | Jooyung Han <jooyung@google.com> | 2021-03-10 15:40:34 +0900 |
---|---|---|
committer | Jooyung Han <jooyung@google.com> | 2021-03-17 11:54:53 +0900 |
commit | 092ef811a056bd891d500788e5fcb412ff4e2f8a (patch) | |
tree | e48477ccef322ca309c44323d9989d41127901de /filesystem | |
parent | b96a04ba49c789eb9b5001f0fb08c9e718532a6a (diff) |
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
Diffstat (limited to 'filesystem')
-rw-r--r-- | filesystem/filesystem.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |