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

Commit 419117ee authored by Lukács T. Berki's avatar Lukács T. Berki Committed by Gerrit Code Review
Browse files

Merge "Make the IsSdkVariant field and method the same."

parents 68c8dd01 2063a0d7

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -3383,7 +3383,7 @@ func DefaultsFactory(props ...interface{}) android.Module { 
}



func (c *Module) IsSdkVariant() bool {

	return c.Properties.IsSdkVariant || c.AlwaysSdk()

	return c.Properties.IsSdkVariant

}



func kytheExtractAllFactory() android.Singleton {

cc/sdk.go

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ func sdkMutator(ctx android.BottomUpMutatorContext) { 
			if !m.UseSdk() && !m.SplitPerApiLevel() {

				ctx.ModuleErrorf("UseSdk() must return true when AlwaysSdk is set, did the factory forget to set Sdk_version?")

			}

			ctx.CreateVariations("sdk")

			modules := ctx.CreateVariations("sdk")

			modules[0].(*Module).Properties.IsSdkVariant = true

		} else if m.UseSdk() || m.SplitPerApiLevel() {

			modules := ctx.CreateVariations("", "sdk")