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

Commit 363ec76a authored by Colin Cross's avatar Colin Cross
Browse files

Raise minsdk for CRT dependencies 

Prevent depending on CRT variations that don't exist by raising
the CRT dependency api level to the minimum supported for the
architecture.

Test: lunch aosp_riscv64-userdebug && m -k
Change-Id: I575355569b3772f5d1fe2530161a1d45aa00a349
parent df2043e9

cc/cc.go

+7 −0
Original line number Diff line number Diff line
@@ -2212,6 +2212,13 @@ func GetCrtVariations(ctx android.BottomUpMutatorContext, 
		if err != nil {

			ctx.PropertyErrorf("min_sdk_version", err.Error())

		}



		// Raise the minSdkVersion to the minimum supported for the architecture.

		minApiForArch := minApiForArch(ctx, m.Target().Arch.ArchType)

		if apiLevel.LessThan(minApiForArch) {

			apiLevel = minApiForArch

		}



		return []blueprint.Variation{

			{Mutator: "sdk", Variation: "sdk"},

			{Mutator: "version", Variation: apiLevel.String()},