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

object files depend only on NDK headers

Browse Source 
* shared libraries and binaries can depend on NDK share libraries

Bug: 208310402
Test: WITH_TIDY=1 make tidy-soong
Test: WITH_TIDY=1 make droid
Change-Id: I88ca8555c62d5ca49e36ca089749722166afec30
This commit is contained in:
Chih-Hung Hsieh
2021-12-05 18:02:50 -08:00
parent 23d5d986fe
commit f6ca1b961b
5 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/library.go
View File

@@ -1322,11 +1322,21 @@ func (library *libraryDecorator) linkStatic(ctx ModuleContext,
return outputFile
}
func ndkSharedLibDeps(ctx ModuleContext) android.Paths {
if ctx.Module().(*Module).IsSdkVariant() {
// The NDK sysroot timestamp file depends on all the NDK
// sysroot header and shared library files.
return android.Paths{getNdkBaseTimestampFile(ctx)}
}
return nil
}
func (library *libraryDecorator) linkShared(ctx ModuleContext,
flags Flags, deps PathDeps, objs Objects) android.Path {
var linkerDeps android.Paths
linkerDeps = append(linkerDeps, flags.LdFlagsDeps...)
linkerDeps = append(linkerDeps, ndkSharedLibDeps(ctx)...)
unexportedSymbols := ctx.ExpandOptionalSource(library.Properties.Unexported_symbols_list, "unexported_symbols_list")
forceNotWeakSymbols := ctx.ExpandOptionalSource(library.Properties.Force_symbols_not_weak_list, "force_symbols_not_weak_list")