diff options
| author | Martin Stjernholm <mast@google.com> | 2021-05-21 19:22:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-21 19:22:15 +0000 |
| commit | f7a62e6c7383dceafb968adf3fdab7801840d772 (patch) | |
| tree | c79e6e15f0659070aac0df34baa86b8234853b2c /cc | |
| parent | 55d7ed4bbfd3410188617f004624f12dc24b4549 (diff) | |
| parent | 59b9f141739e5c0e852c741f6f809121a90fc228 (diff) | |
Merge changes I4e7a7ac5,I0c73361b into sc-dev
* changes:
Record the actual APEXes that a module is part of.
Rename InApexes -> InApexVariants
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/cc.go | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2831,7 +2831,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps { // Add the dependency to the APEX(es) providing the library so that // m <module> can trigger building the APEXes as well. depApexInfo := ctx.OtherModuleProvider(dep, android.ApexInfoProvider).(android.ApexInfo) - for _, an := range depApexInfo.InApexes { + for _, an := range depApexInfo.InApexVariants { c.Properties.ApexesProvidingSharedLibs = append( c.Properties.ApexesProvidingSharedLibs, an) } |