StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use product variables from the overridden apex

Browse Source 
override_apex's bp2build converter had a bug where it was looking at
the product variables for the override_apex module itself instead of
for the base module it is overriding.

Fixes: 271424349
Test: go test
Change-Id: If1e2653d3751fa908faf0ab97dfa2e943ebe98ec
This commit is contained in:
Cole Faust
2023-03-08 12:29:50 -08:00
parent 8eb8ae649c
commit 912bc8862e
7 changed files with 96 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/variable.go
View File

@@ -663,9 +663,8 @@ func (p *ProductConfigProperty) SelectKey() string {
type ProductConfigProperties map[string]map[ProductConfigProperty]interface{}
// ProductVariableProperties returns a ProductConfigProperties containing only the properties which
// have been set for the module in the given context.
func ProductVariableProperties(ctx BazelConversionPathContext) ProductConfigProperties {
module := ctx.Module()
// have been set for the given module.
func ProductVariableProperties(ctx ArchVariantContext, module Module) ProductConfigProperties {
moduleBase := module.base()
productConfigProperties := ProductConfigProperties{}