diff options
| author | 2021-04-15 04:41:13 +0900 | |
|---|---|---|
| committer | 2021-04-15 05:27:48 +0900 | |
| commit | c6a91ec6d88ed7dc4cdbb1fc5329b4510b9c7aee (patch) | |
| tree | 708cf7f5c09f110442bc143d34f2abbeb9f09230 /linkerconfig | |
| parent | d466b4a1f5ab2b1553bb3b6ed849e006713d9f31 (diff) | |
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
Diffstat (limited to 'linkerconfig')
| -rw-r--r-- | linkerconfig/linkerconfig.go | 5 |
1 files 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 |