From 65b62244712802432940c74a6b43d0a509b94cb8 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 25 Nov 2020 12:44:59 +0900 Subject: Clients of PackagingBase can customize dependency tag to use Previously, the dep tag used by PackagingBase was fixed, which prevented some of its clients (e.g. cvd-host-package) from opting in to android.InstallAlwaysNeededDependencyTag. Now, PackagingBase.AddDeps accepts the dependency tag to use. Also, dependencies toward rust dylib, rlib, and proc_macro are configured to return true on InstallDepNeeded. This is required to install shared_lib dependencies of the rust modules when they are depended on by a rust binary. Exempt-From-Owner-Approval: a trivial change after +2 from the owner. This has to land ASAP as many users are affected by acloud being unavailable. Bug: N/A Test: m Test: acloud create --local-instance --local-image Change-Id: If22aee7c6f314fcb03b9d4fe6901a2557f1e899c --- filesystem/filesystem.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index a1605b449..ecbfbab09 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -18,6 +18,8 @@ import ( "fmt" "android/soong/android" + + "github.com/google/blueprint" ) func init() { @@ -36,8 +38,10 @@ func filesystemFactory() android.Module { return module } +var dependencyTag = struct{ blueprint.BaseDependencyTag }{} + func (f *filesystem) DepsMutator(ctx android.BottomUpMutatorContext) { - f.AddDeps(ctx) + f.AddDeps(ctx, dependencyTag) } var pctx = android.NewPackageContext("android/soong/filesystem") -- cgit v1.2.3-59-g8ed1b