diff options
| author | 2025-03-13 18:36:35 +0000 | |
|---|---|---|
| committer | 2025-03-13 18:36:35 +0000 | |
| commit | f22120fb1da7f75a571966124bb0da6a57fd4f07 (patch) | |
| tree | 9ffabf8102382f54c89595a59e3211eccd766217 /java/app.go | |
| parent | 7c18e7f15b997e0e3199111446e0511ffd96b811 (diff) | |
Change CommonModuleInfoProvider to a pointer.
Bug: 358427516
Test: Manually verified genereated ninja and mk files, unit tests.
Change-Id: I53a6dd718232735decbeb93febfd269dd9449e86
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/app.go b/java/app.go index 560129b64..553c65894 100644 --- a/java/app.go +++ b/java/app.go @@ -1233,7 +1233,7 @@ func collectJniDeps(ctx android.ModuleContext, seenModulePaths := make(map[string]bool) ctx.WalkDepsProxy(func(module, parent android.ModuleProxy) bool { - if !android.OtherModuleProviderOrDefault(ctx, module, android.CommonModuleInfoProvider).Enabled { + if !android.OtherModulePointerProviderOrDefault(ctx, module, android.CommonModuleInfoProvider).Enabled { return false } otherName := ctx.OtherModuleName(module) @@ -1253,7 +1253,7 @@ func collectJniDeps(ctx android.ModuleContext, } seenModulePaths[path.String()] = true - commonInfo := android.OtherModuleProviderOrDefault(ctx, module, android.CommonModuleInfoProvider) + commonInfo := android.OtherModulePointerProviderOrDefault(ctx, module, android.CommonModuleInfoProvider) if checkNativeSdkVersion && commonInfo.SdkVersion == "" { ctx.PropertyErrorf("jni_libs", "JNI dependency %q uses platform APIs, but this module does not", otherName) @@ -1316,7 +1316,7 @@ func (a *AndroidApp) buildAppDependencyInfo(ctx android.ModuleContext) { // Skip dependencies that are only available to APEXes; they are developed with updatability // in mind and don't need manual approval. - if android.OtherModuleProviderOrDefault(ctx, to, android.CommonModuleInfoProvider).NotAvailableForPlatform { + if android.OtherModulePointerProviderOrDefault(ctx, to, android.CommonModuleInfoProvider).NotAvailableForPlatform { return true } |