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

Commit 533b98cd authored by Artur Satayev's avatar Artur Satayev
Browse files

Don't track modules that are only available to APEXes. 

Modules that are not available for platform are developed with
updatability in mind, and do not require manual approvals.

Bug: 181223240
Test: checkbuild
Change-Id: I10b91053b3ef5a9ff5400d9d7a68fae3144a671c
parent a55aefd5

android/apex.go

+2 −0
Original line number Diff line number Diff line
@@ -719,6 +719,8 @@ func (d *ApexBundleDepsInfo) FullListPath() Path { 
// Generate two module out files:

// 1. FullList with transitive deps and their parents in the dep graph

// 2. FlatList with a flat list of transitive deps

// In both cases transitive deps of external deps are not included. Neither are deps that are only

// available to APEXes; they are developed with updatability in mind and don't need manual approval.

func (d *ApexBundleDepsInfo) BuildDepsInfoLists(ctx ModuleContext, minSdkVersion string, depInfos DepNameToDepInfoMap) {

	var fullContent strings.Builder

	var flatContent strings.Builder

apex/apex_test.go

+3 −9
Original line number Diff line number Diff line
@@ -642,14 +642,12 @@ func TestBasicApex(t *testing.T) { 


	fullDepsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("depsinfo/fulllist.txt").Args["content"], "\\n")

	ensureListContains(t, fullDepsInfo, "  myjar(minSdkVersion:(no version)) <- myapex")

	ensureListContains(t, fullDepsInfo, "  mylib(minSdkVersion:(no version)) <- myapex")

	ensureListContains(t, fullDepsInfo, "  mylib2(minSdkVersion:(no version)) <- mylib")

	ensureListContains(t, fullDepsInfo, "  myotherjar(minSdkVersion:(no version)) <- myjar")

	ensureListContains(t, fullDepsInfo, "  mysharedjar(minSdkVersion:(no version)) (external) <- myjar")



	flatDepsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("depsinfo/flatlist.txt").Args["content"], "\\n")

	ensureListContains(t, flatDepsInfo, "myjar(minSdkVersion:(no version))")

	ensureListContains(t, flatDepsInfo, "mylib(minSdkVersion:(no version))")

	ensureListContains(t, flatDepsInfo, "mylib2(minSdkVersion:(no version))")

	ensureListContains(t, flatDepsInfo, "myotherjar(minSdkVersion:(no version))")

	ensureListContains(t, flatDepsInfo, "mysharedjar(minSdkVersion:(no version)) (external)")
@@ -1148,13 +1146,9 @@ func TestApexWithExplicitStubsDependency(t *testing.T) { 
	ensureNotContains(t, libFooStubsLdFlags, "libbar.so")



	fullDepsInfo := strings.Split(ctx.ModuleForTests("myapex2", "android_common_myapex2_image").Output("depsinfo/fulllist.txt").Args["content"], "\\n")

	ensureListContains(t, fullDepsInfo, "  mylib(minSdkVersion:(no version)) <- myapex2")

	ensureListContains(t, fullDepsInfo, "  libbaz(minSdkVersion:(no version)) <- mylib")

	ensureListContains(t, fullDepsInfo, "  libfoo(minSdkVersion:(no version)) (external) <- mylib")



	flatDepsInfo := strings.Split(ctx.ModuleForTests("myapex2", "android_common_myapex2_image").Output("depsinfo/flatlist.txt").Args["content"], "\\n")

	ensureListContains(t, flatDepsInfo, "mylib(minSdkVersion:(no version))")

	ensureListContains(t, flatDepsInfo, "libbaz(minSdkVersion:(no version))")

	ensureListContains(t, flatDepsInfo, "libfoo(minSdkVersion:(no version)) (external)")

}

apex/builder.go

+7 −1
Original line number Diff line number Diff line
@@ -926,9 +926,15 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) { 
			return !externalDep

		}



		// Skip dependencies that are only available to APEXes; they are developed with updatability

		// in mind and don't need manual approval.

		if to.(android.ApexModule).NotAvailableForPlatform() {

			return !externalDep

		}



		depTag := ctx.OtherModuleDependencyTag(to)

		if skipDepCheck, ok := depTag.(android.SkipApexAllowedDependenciesCheck); ok && skipDepCheck.SkipApexAllowedDependenciesCheck() {

		// Check to see if dependency been marked to skip the dependency check

		if skipDepCheck, ok := depTag.(android.SkipApexAllowedDependenciesCheck); ok && skipDepCheck.SkipApexAllowedDependenciesCheck() {

			return !externalDep

		}

java/app.go

+7 −0
Original line number Diff line number Diff line
@@ -812,6 +812,13 @@ func (a *AndroidApp) buildAppDependencyInfo(ctx android.ModuleContext) { 
	depsInfo := android.DepNameToDepInfoMap{}

	a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool {

		depName := to.Name()



		// Skip dependencies that are only available to APEXes; they are developed with updatability

		// in mind and don't need manual approval.

		if to.(android.ApexModule).NotAvailableForPlatform() {

			return true

		}



		if info, exist := depsInfo[depName]; exist {

			info.From = append(info.From, from.Name())

			info.IsExternal = info.IsExternal && externalDep