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

Merge "native shared libs in an SDK can be snapshotted"

Browse Source
This commit is contained in:
Treehugger Robot
2019-11-01 01:23:35 +00:00
committed by Gerrit Code Review
parent 5d0b3b7195 73c54ee7fe
commit 40dfbe3a16
4 changed files with 402 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/library.go
View File

@@ -158,6 +158,10 @@ type FlagExporterProperties struct {
// listed in local_include_dirs.
Export_include_dirs []string `android:"arch_variant"`
// list of directories that will be added to the system include path
// using -isystem for this module and any module that links against this module.
Export_system_include_dirs []string `android:"arch_variant"`
Target struct {
Vendor struct {
// list of exported include directories, like
@@ -245,10 +249,13 @@ func (f *flagExporter) exportedIncludes(ctx ModuleContext) android.Paths {
func (f *flagExporter) exportIncludes(ctx ModuleContext) {
f.dirs = append(f.dirs, f.exportedIncludes(ctx)...)
f.systemDirs = append(f.systemDirs, android.PathsForModuleSrc(ctx, f.Properties.Export_system_include_dirs)...)
}
func (f *flagExporter) exportIncludesAsSystem(ctx ModuleContext) {
// all dirs are force exported as system
f.systemDirs = append(f.systemDirs, f.exportedIncludes(ctx)...)
f.systemDirs = append(f.systemDirs, android.PathsForModuleSrc(ctx, f.Properties.Export_system_include_dirs)...)
}
func (f *flagExporter) reexportDirs(dirs ...android.Path) {
@@ -1294,7 +1301,7 @@ func stubsVersionsFor(config android.Config) map[string][]string {
var stubsVersionsLock sync.Mutex
func latestStubsVersionFor(config android.Config, name string) string {
func LatestStubsVersionFor(config android.Config, name string) string {
versions, ok := stubsVersionsFor(config)[name]
if ok && len(versions) > 0 {
// the versions are alreay sorted in ascending order