summaryrefslogtreecommitdiff
path: root/apex/builder.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2024-11-08 23:11:47 +0000
committer Yu Liu <yudiliu@google.com> 2024-11-12 03:48:18 +0000
commitd3228acdc8658e7bd9ef9662c425822ae55fdebf (patch)
treee44aabb46fe66af9168e07d91792d7dd6a724e04 /apex/builder.go
parent48a943f674de35fb78e1e8d7f36b823798c96233 (diff)
Change GetModuleFromPathDep to use ModuleProxy.
Bug: 377723687 Test: Compare ninja and mk files generated. Change-Id: I428b0965b217adb20a792ebde88374e0c6fae9d6
Diffstat (limited to 'apex/builder.go')
-rw-r--r--apex/builder.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/apex/builder.go b/apex/builder.go
index 305d5092a..b04a9d729 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -397,8 +397,10 @@ func (a *apexBundle) buildFileContexts(ctx android.ModuleContext) android.Output
} else {
if m, t := android.SrcIsModuleWithTag(*a.properties.File_contexts); m != "" {
isFileContextsModule = true
- otherModule := android.GetModuleFromPathDep(ctx, m, t)
- fileContextsDir = ctx.OtherModuleDir(otherModule)
+ otherModule := android.GetModuleProxyFromPathDep(ctx, m, t)
+ if otherModule != nil {
+ fileContextsDir = ctx.OtherModuleDir(*otherModule)
+ }
}
fileContexts = android.PathForModuleSrc(ctx, *a.properties.File_contexts)
}