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

Commit d8c9b4ed authored by Yu Liu's avatar Yu Liu Committed by Gerrit Code Review
Browse files

Merge "Convert CombinedApis's GenerateAndroidBuildActions to use ModuleProxy." into main

parents 99fa8dc8 f0040f3f
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ func (a *CombinedApis) DepsMutator(ctx android.BottomUpMutatorContext) {


func (a *CombinedApis) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func (a *CombinedApis) GenerateAndroidBuildActions(ctx android.ModuleContext) {
	ctx.WalkDeps(func(child, parent android.Module) bool {
	ctx.WalkDeps(func(child, parent android.Module) bool {
		if _, ok := child.(java.AndroidLibraryDependency); ok && child.Name() != "framework-res" {
		if _, ok := android.OtherModuleProvider(ctx, child, java.AndroidLibraryInfoProvider); ok && child.Name() != "framework-res" {
			// Stubs of BCP and SSCP libraries should not have any dependencies on apps
			// Stubs of BCP and SSCP libraries should not have any dependencies on apps
			// This check ensures that we do not run into circular dependencies when UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true
			// This check ensures that we do not run into circular dependencies when UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true
			ctx.ModuleErrorf(
			ctx.ModuleErrorf(