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

Commit 37c219a1 authored by Jooyung Han's avatar Jooyung Han
Browse files

Interpret CRT object's min_sdk_version with ApiLevel 

min_sdk_version values should be interpreted before use.

Bug: 171506470
Bug: n/a
Test: m (in REL)
Merged-In: Ia45f5c7aeb4efcd8daef1deaf54f333dcdd1379d
Change-Id: Ia45f5c7aeb4efcd8daef1deaf54f333dcdd1379d
(cherry picked from commit 94a76ee8)
parent 07b43812

cc/cc.go

+5 −1
Original line number Diff line number Diff line
@@ -1971,9 +1971,13 @@ func GetCrtVariations(ctx android.BottomUpMutatorContext, 
		if minSdkVersion == "" || minSdkVersion == "apex_inherit" {

			minSdkVersion = m.SdkVersion()

		}

		apiLevel, err := android.ApiLevelFromUser(ctx, minSdkVersion)

		if err != nil {

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

		}

		return []blueprint.Variation{

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

			{Mutator: "version", Variation: minSdkVersion},

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

		}

	}

	return []blueprint.Variation{