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

Commit c6a91ec6 authored by Jooyung Han's avatar Jooyung Han
Browse files

Allow uninstallable linker_config to be packaged

Till now, linker_config has to be installable to be packaged. With this
commit, packaging modules like filesystem now can include uninstallable
linker_config. This can help when linker_config can conflict with other
partitions e.g. system.

Bug: 185391776
Test: build filesystem with uninstallable linker_config
Change-Id: Ic2cece08be73749e6bd1f813152c67f8e3904c20
parent d466b4a1
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -81,9 +81,10 @@ func (l *linkerConfig) GenerateAndroidBuildActions(ctx android.ModuleContext) {
	linkerConfigRule.Build("conv_linker_config",
		"Generate linker config protobuf "+l.outputFilePath.String())

	if proptools.BoolDefault(l.properties.Installable, true) {
		ctx.InstallFile(l.installDirPath, l.outputFilePath.Base(), l.outputFilePath)
	if !proptools.BoolDefault(l.properties.Installable, true) {
		l.SkipInstall()
	}
	ctx.InstallFile(l.installDirPath, l.outputFilePath.Base(), l.outputFilePath)
}

// linker_config generates protobuf file from json file. This protobuf file will be used from