From c6a91ec6d88ed7dc4cdbb1fc5329b4510b9c7aee Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 15 Apr 2021 04:41:13 +0900 Subject: [PATCH] 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 --- linkerconfig/linkerconfig.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linkerconfig/linkerconfig.go b/linkerconfig/linkerconfig.go index da80a4715..0ed7409b7 100644 --- a/linkerconfig/linkerconfig.go +++ b/linkerconfig/linkerconfig.go @@ -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