diff options
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index 93ceb8387..fa71ffa5c 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -227,7 +227,6 @@ func makeApexAvailableWhitelist() map[string][]string { "netd_aidl_interface-unstable-java", "netd_event_listener_interface-java", "netlink-client", - "networkstack-aidl-interfaces-unstable-java", "networkstack-client", "sap-api-java-static", "services.net", @@ -679,7 +678,6 @@ func makeApexAvailableWhitelist() map[string][]string { "netd_aidl_interface-unstable-java", "netd_event_listener_interface-java", "netlink-client", - "networkstack-aidl-interfaces-unstable-java", "networkstack-client", "services.net", "wifi-lite-protos", @@ -1604,6 +1602,8 @@ func (a *apexBundle) IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizer return android.InList(sanitizerName, globalSanitizerNames) } +var _ cc.Coverage = (*apexBundle)(nil) + func (a *apexBundle) IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool { return ctx.Device() && (ctx.DeviceConfig().NativeCoverageEnabled() || ctx.DeviceConfig().ClangCoverageEnabled()) } @@ -1620,6 +1620,8 @@ func (a *apexBundle) MarkAsCoverageVariant(coverage bool) { a.properties.IsCoverageVariant = coverage } +func (a *apexBundle) EnableCoverageIfNeeded() {} + // TODO(jiyong) move apexFileFor* close to the apexFile type definition func apexFileForNativeLibrary(ctx android.BaseModuleContext, ccMod *cc.Module, handleSpecialLibs bool) apexFile { // Decide the APEX-local directory by the multilib of the library @@ -2073,8 +2075,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { // // Always include if we are a host-apex however since those won't have any // system libraries. - if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.Name(), a.requiredDeps) { - a.requiredDeps = append(a.requiredDeps, cc.Name()) + if !android.DirectlyInAnyApex(ctx, cc.Name()) && !android.InList(cc.BaseModuleName(), a.requiredDeps) { + a.requiredDeps = append(a.requiredDeps, cc.BaseModuleName()) } requireNativeLibs = append(requireNativeLibs, cc.OutputFile().Path().Base()) // Don't track further |