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

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

Merge "Change enforceAppUpdatability to use ModuleProxy." into main am: 7bc5be9e 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3390009



Change-Id: I34d7108b96767ba617f5fe964aff7683a307eb25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b25923d8 7bc5be9e

apex/apex.go

+1 −1
Original line number Diff line number Diff line
@@ -2328,7 +2328,7 @@ func (a *apexBundle) enforceAppUpdatability(mctx android.ModuleContext) { 
	}

	if a.Updatable() {

		// checking direct deps is sufficient since apex->apk is a direct edge, even when inherited via apex_defaults

		mctx.VisitDirectDeps(func(module android.Module) {

		mctx.VisitDirectDepsProxy(func(module android.ModuleProxy) {

			if appInfo, ok := android.OtherModuleProvider(mctx, module, java.AppInfoProvider); ok {

				// ignore android_test_app

				if !appInfo.TestHelperApp && !appInfo.Updatable {