diff options
| author | 2023-05-11 00:13:44 +0000 | |
|---|---|---|
| committer | 2023-05-11 00:13:44 +0000 | |
| commit | 494fca1328faf226378486b063d2f9323db6301c (patch) | |
| tree | c4e9cb79532cc9460b5ad7bffc0cfcf95f360013 /apex/apex.go | |
| parent | a1909da281a4d438fde402b28c882eb04422b93b (diff) | |
| parent | 6aaab9d2aa4f529d04f8bcbb4f87e3f1841e314e (diff) | |
Merge changes from topic "stub-impl-per-api-domain"
* changes:
Special case platform variant of bootstrap libs
Select stub/impl per apex variant
For test apexes, base_apex_name is the api domain
Broaden the granularity of config_setting from apex_name to api_domain
Print default val if all vals in axis match default val
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index 6a64ad6cd..33ed11199 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -3700,6 +3700,8 @@ func convertWithBp2build(a *apexBundle, ctx android.TopDownMutatorContext) (baze commonAttrs := android.CommonAttributes{} if a.testApex { commonAttrs.Testonly = proptools.BoolPtr(true) + // Set the api_domain of the test apex + attrs.Base_apex_name = proptools.StringPtr(cc.GetApiDomain(a.Name())) } return attrs, props, commonAttrs |