diff options
| author | 2021-05-26 05:13:18 +0000 | |
|---|---|---|
| committer | 2021-05-26 05:13:18 +0000 | |
| commit | e33da475f9f6e8f56249a93fb2f22ee048db9620 (patch) | |
| tree | 55c3b720e8c47842d29c8e5507284d9533907ffc /android/variable.go | |
| parent | 7b632c48e68dd65991b95908a1fbb16431816169 (diff) | |
| parent | 42b29a5b4021d65eaede2e2fe3c458e75c42c1cd (diff) | |
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
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/variable.go b/android/variable.go index 6df7a2d2a..1383daee4 100644 --- a/android/variable.go +++ b/android/variable.go @@ -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 |