diff options
| author | 2025-02-28 12:05:20 -0800 | |
|---|---|---|
| committer | 2025-02-28 12:05:20 -0800 | |
| commit | 58047e846963c84c2784a685d4c2644bd7c80ff6 (patch) | |
| tree | c3b95847c8582b0d33fe7a6d78eed8c3d7a52e24 /apex/apex.go | |
| parent | 9cbe288fa7eaf56a62c764bfcba35fc550543208 (diff) | |
| parent | 71f1ea3f81feae294a3031799cd638c38610850e (diff) | |
Merge changes from topics "EqualModules", "tidyPhonySingleton" into main
* changes:
Convert tidyPhonySingleton, jdepsGeneratorSingleton and genNoticeBuildRules to use ModuleProxy.
Make EqualModules a free function.
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/apex.go b/apex/apex.go index bda5f2f2a..f70076899 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1849,7 +1849,7 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, return false } depName := ctx.OtherModuleName(child) - if ctx.EqualModules(parent, ctx.Module()) { + if android.EqualModules(parent, ctx.Module()) { switch depTag { case sharedLibTag, jniLibTag: isJniLib := depTag == jniLibTag @@ -2893,7 +2893,7 @@ func (a *apexBundle) verifyNativeImplementationLibs(ctx android.ModuleContext) { tag := ctx.OtherModuleDependencyTag(child) - if ctx.EqualModules(parent, ctx.Module()) { + if android.EqualModules(parent, ctx.Module()) { if !checkApexTag(tag) { return false } |