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

Commit 1a34e943 authored by Yu Liu's avatar Yu Liu Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3414380



Change-Id: I8710c50e023b01be6996c472cbdaa8718381759f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0cd3d5b4 d8c9b4ed

api/api.go

+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(