Make GetTargetProperties() aware of more complex targets, like 'android_arm', instead of just 'android'. am: c194ffbcf3
am: 42b29a5b40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1712089 Change-Id: I2a68455e55701c2251d61a0db6855c34879fea93
This commit is contained in:
committed by
Automerger Merge Worker
commit
e33da475f9
@@ -489,7 +489,10 @@ func ProductVariableProperties(ctx BaseMutatorContext) ProductConfigProperties {
|
||||
for os, targetProps := range moduleBase.GetTargetProperties(ctx, moduleBase.variableProperties) {
|
||||
// GetTargetProperties is creating an instance of the requested type
|
||||
// and productVariablesValues expects an interface, so no need to cast
|
||||
productVariableValues(targetProps, os.Name, &productConfigProperties)
|
||||
productVariableValues(targetProps.Properties, os.Name, &productConfigProperties)
|
||||
for arch, archProperties := range targetProps.ArchProperties {
|
||||
productVariableValues(archProperties, os.Name+"_"+arch.Name, &productConfigProperties)
|
||||
}
|
||||
}
|
||||
|
||||
return productConfigProperties
|
||||
|
Reference in New Issue
Block a user