Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81e45629 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Collect aconfig files from *_libs in java_api_library" into main

parents e00f2462 458fde5f

java/java.go

+3 −0
Original line number Diff line number Diff line
@@ -2311,14 +2311,17 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		case libTag:

			if provider, ok := android.OtherModuleProvider(ctx, dep, JavaInfoProvider); ok {

				classPaths = append(classPaths, provider.HeaderJars...)

				al.aconfigProtoFiles = append(al.aconfigProtoFiles, provider.AconfigIntermediateCacheOutputPaths...)

			}

		case bootClasspathTag:

			if provider, ok := android.OtherModuleProvider(ctx, dep, JavaInfoProvider); ok {

				bootclassPaths = append(bootclassPaths, provider.HeaderJars...)

				al.aconfigProtoFiles = append(al.aconfigProtoFiles, provider.AconfigIntermediateCacheOutputPaths...)

			}

		case staticLibTag:

			if provider, ok := android.OtherModuleProvider(ctx, dep, JavaInfoProvider); ok {

				staticLibs = append(staticLibs, provider.HeaderJars...)

				al.aconfigProtoFiles = append(al.aconfigProtoFiles, provider.AconfigIntermediateCacheOutputPaths...)

			}

		case systemModulesTag:

			if sm, ok := android.OtherModuleProvider(ctx, dep, SystemModulesProvider); ok {