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

Commit 17f9dc5f authored by Colin Cross's avatar Colin Cross
Browse files

Remove obsolete rust VariantIsStatic 

Rust modules no longer have static variants after
I2925f67f6dc9329dae3dcccafb8560900ac8a6fc, remove the VariantIsStatic
field.

Bug: 254469782
Test: m
Test: m blueprint_tests
Change-Id: Ic63412a27c3a09dec43c4a9064a3e1f4181147db
parent 77c5e9f9

rust/library.go

+2 −10
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ type LibraryMutatedProperties struct { 
	VariantIsRlib bool `blueprint:"mutated"`

	// This variant is a shared library

	VariantIsShared bool `blueprint:"mutated"`

	// This variant is a static library

	VariantIsStatic bool `blueprint:"mutated"`

	// This variant is a source provider

	VariantIsSource bool `blueprint:"mutated"`
@@ -179,7 +177,7 @@ func (library *libraryDecorator) shared() bool { 
}



func (library *libraryDecorator) static() bool {

	return library.MutatedProperties.VariantIsStatic

	return false

}



func (library *libraryDecorator) source() bool {
@@ -205,14 +203,12 @@ func (library *libraryDecorator) buildStatic() bool { 
func (library *libraryDecorator) setRlib() {

	library.MutatedProperties.VariantIsRlib = true

	library.MutatedProperties.VariantIsDylib = false

	library.MutatedProperties.VariantIsStatic = false

	library.MutatedProperties.VariantIsShared = false

}



func (library *libraryDecorator) setDylib() {

	library.MutatedProperties.VariantIsRlib = false

	library.MutatedProperties.VariantIsDylib = true

	library.MutatedProperties.VariantIsStatic = false

	library.MutatedProperties.VariantIsShared = false

}
@@ -229,17 +225,13 @@ func (library *libraryDecorator) setDylibStd() { 
}



func (library *libraryDecorator) setShared() {

	library.MutatedProperties.VariantIsStatic = false

	library.MutatedProperties.VariantIsShared = true

	library.MutatedProperties.VariantIsRlib = false

	library.MutatedProperties.VariantIsDylib = false

}



func (library *libraryDecorator) setStatic() {

	library.MutatedProperties.VariantIsStatic = true

	library.MutatedProperties.VariantIsShared = false

	library.MutatedProperties.VariantIsRlib = false

	library.MutatedProperties.VariantIsDylib = false

	panic(fmt.Errorf("static variant is not supported for rust modules, use the rlib variant instead"))

}



func (library *libraryDecorator) setSource() {