StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "versioning macro is exported from prebuilt stubs as well"

Browse Source
This commit is contained in:
Treehugger Robot
2020-12-16 01:31:10 +00:00
committed by Gerrit Code Review
parent fc0cba0b77 892a98f0a3
commit 6a8c18a89b
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/apex_test.go
View File

@@ -6559,6 +6559,11 @@ func TestPrebuiltStubLibDep(t *testing.T) {
if entry.mkEntries.EntryMap["LOCAL_NOT_AVAILABLE_FOR_PLATFORM"] != nil { if entry.mkEntries.EntryMap["LOCAL_NOT_AVAILABLE_FOR_PLATFORM"] != nil {
t.Errorf("AndroidMk entry for \"stublib\" has LOCAL_NOT_AVAILABLE_FOR_PLATFORM set: %+v", entry.mkEntries) t.Errorf("AndroidMk entry for \"stublib\" has LOCAL_NOT_AVAILABLE_FOR_PLATFORM set: %+v", entry.mkEntries)
} }
cflags := entry.mkEntries.EntryMap["LOCAL_EXPORT_CFLAGS"]
expected := "-D__STUBLIB_API__=1"
if !android.InList(expected, cflags) {
t.Errorf("LOCAL_EXPORT_CFLAGS expected to have %q, but got %q", expected, cflags)
}
} }
}) })
} }

12
cc/library.go
View File

@@ -1237,9 +1237,7 @@ func (library *libraryDecorator) link(ctx ModuleContext,
} }
// Add stub-related flags if this library is a stub library. // Add stub-related flags if this library is a stub library.
if library.buildStubs() && !library.skipAPIDefine { library.exportVersioningMacroIfNeeded(ctx)
library.reexportFlags("-D" + versioningMacroName(ctx.Module().(*Module).ImplementationModuleName(ctx)) + "=" + library.stubsVersion())
}
// Propagate a Provider containing information about exported flags, deps, and include paths. // Propagate a Provider containing information about exported flags, deps, and include paths.
library.flagExporter.setProvider(ctx) library.flagExporter.setProvider(ctx)
@@ -1247,6 +1245,14 @@ func (library *libraryDecorator) link(ctx ModuleContext,
return out return out
} }
func (library *libraryDecorator) exportVersioningMacroIfNeeded(ctx android.BaseModuleContext) {
if library.buildStubs() && !library.skipAPIDefine {
name := versioningMacroName(ctx.Module().(*Module).ImplementationModuleName(ctx))
ver := library.stubsVersion()
library.reexportFlags("-D" + name + "=" + ver)
}
}
// buildStatic returns true if this library should be built as a static library. // buildStatic returns true if this library should be built as a static library.
func (library *libraryDecorator) buildStatic() bool { func (library *libraryDecorator) buildStatic() bool {
return library.MutatedProperties.BuildStatic && return library.MutatedProperties.BuildStatic &&

8
cc/prebuilt.go
View File

@@ -17,6 +17,7 @@ package cc
import ( import (
"android/soong/android" "android/soong/android"
"path/filepath" "path/filepath"
"strings"
) )
func init() { func init() {
@@ -117,6 +118,8 @@ func (p *prebuiltLibraryLinker) link(ctx ModuleContext,
return nil return nil
} }
p.libraryDecorator.exportVersioningMacroIfNeeded(ctx)
in := android.PathForModuleSrc(ctx, srcs[0]) in := android.PathForModuleSrc(ctx, srcs[0])
if p.static() { if p.static() {
@@ -226,6 +229,11 @@ func (p *prebuiltLibraryLinker) disablePrebuilt() {
p.properties.Srcs = nil p.properties.Srcs = nil
} }
// Implements versionedInterface
func (p *prebuiltLibraryLinker) implementationModuleName(name string) string {
return strings.TrimPrefix(name, "prebuilt_")
}
func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) { func NewPrebuiltLibrary(hod android.HostOrDeviceSupported) (*Module, *libraryDecorator) {
module, library := NewLibrary(hod) module, library := NewLibrary(hod)
module.compiler = nil module.compiler = nil