openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Allow NDK static libraries to use the NDK sysroot."

This commit is contained in:
Treehugger Robot 2017-12-16 03:14:43 +00:00 committed by Gerrit Code Review
parent 04bd5080bf 6ab43d8597
commit 2555b259ad
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cc/compiler.go
View File

@ -522,7 +522,7 @@ func ndkPathDeps(ctx ModuleContext) android.Paths {
if ctx.useSdk() {
// The NDK sysroot timestamp file depends on all the NDK sysroot files
// (headers and libraries).
return android.Paths{getNdkSysrootTimestampFile(ctx)}
return android.Paths{getNdkBaseTimestampFile(ctx)}
}
return nil
}

29
cc/ndk_sysroot.go
View File

@ -74,7 +74,16 @@ func getNdkSysrootBase(ctx android.PathContext) android.OutputPath {
return getNdkInstallBase(ctx).Join(ctx, "sysroot")
}
func getNdkSysrootTimestampFile(ctx android.PathContext) android.WritablePath {
// The base timestamp file depends on the NDK headers and stub shared libraries,
// but not the static libraries. This distinction is needed because the static
// libraries themselves might need to depend on the base sysroot.
func getNdkBaseTimestampFile(ctx android.PathContext) android.WritablePath {
return android.PathForOutput(ctx, "ndk_base.timestamp")
}
// The full timestamp file depends on the base timestamp *and* the static
// libraries.
func getNdkFullTimestampFile(ctx android.PathContext) android.WritablePath {
return android.PathForOutput(ctx, "ndk.timestamp")
}
@ -85,6 +94,7 @@ func NdkSingleton() android.Singleton {
type ndkSingleton struct{}
func (n *ndkSingleton) GenerateBuildActions(ctx android.SingletonContext) {
var staticLibInstallPaths android.Paths
var installPaths android.Paths
var licensePaths android.Paths
ctx.VisitAllModules(func(module android.Module) {
@ -109,7 +119,8 @@ func (n *ndkSingleton) GenerateBuildActions(ctx android.SingletonContext) {
if library, ok := m.linker.(*libraryDecorator); ok {
if library.ndkSysrootPath != nil {
installPaths = append(installPaths, library.ndkSysrootPath)
staticLibInstallPaths = append(
staticLibInstallPaths, library.ndkSysrootPath)
}
}
}
@ -123,13 +134,21 @@ func (n *ndkSingleton) GenerateBuildActions(ctx android.SingletonContext) {
Inputs: licensePaths,
})
depPaths := append(installPaths, combinedLicense)
baseDepPaths := append(installPaths, combinedLicense)
// There's a dummy "ndk" rule defined in ndk/Android.mk that depends on
// this. `m ndk` will build the sysroots.
ctx.Build(pctx, android.BuildParams{
Rule: android.Touch,
Output: getNdkSysrootTimestampFile(ctx),
Implicits: depPaths,
Output: getNdkBaseTimestampFile(ctx),
Implicits: baseDepPaths,
})
fullDepPaths := append(staticLibInstallPaths, getNdkBaseTimestampFile(ctx))
ctx.Build(pctx, android.BuildParams{
Rule: android.Touch,
Output: getNdkFullTimestampFile(ctx),
Implicits: fullDepPaths,
})
}