tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cc/binary.go
View file

@ -411,6 +411,7 @@ func (binary *binaryDecorator) link(ctx ModuleContext,
linkerDeps = append(linkerDeps, deps.EarlySharedLibsDeps...)
linkerDeps = append(linkerDeps, deps.SharedLibsDeps...)
linkerDeps = append(linkerDeps, deps.LateSharedLibsDeps...)
linkerDeps = append(linkerDeps, ndkSharedLibDeps(ctx)...)
}
validations = append(validations, objs.tidyFiles...)

6
cc/builder.go
View file

@ -549,10 +549,6 @@ func transformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles, no
return "$" + kind + n
}
// clang-tidy checks source files and does not need to link with libraries.
// tidyPathDeps should contain pathDeps but not libraries.
tidyPathDeps := skipNdkLibraryDeps(ctx, pathDeps)
for i, srcFile := range srcFiles {
objFile := android.ObjPathWithExt(ctx, subdir, srcFile, "o")
@ -676,7 +672,7 @@ func transformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles, no
Output: tidyFile,
Input: srcFile,
Implicits: cFlagsDeps,
OrderOnly: tidyPathDeps,
OrderOnly: pathDeps,
Args: map[string]string{
"ccCmd": ccCmd,
"cFlags": shareFlags("cFlags", escapeSingleQuotes(moduleToolingFlags)),

6
cc/compiler.go
View file

@ -637,9 +637,9 @@ var gnuToCReplacer = strings.NewReplacer("gnu", "c")
func ndkPathDeps(ctx ModuleContext) android.Paths {
if ctx.Module().(*Module).IsSdkVariant() {
// The NDK sysroot timestamp file depends on all the NDK sysroot files
// (headers and libraries).
return android.Paths{getNdkBaseTimestampFile(ctx)}
// The NDK sysroot timestamp file depends on all the NDK sysroot header files
// for compiling src to obj files.
return android.Paths{getNdkHeadersTimestampFile(ctx)}
}
return nil
}

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")

15
cc/ndk_sysroot.go
View file

@ -94,21 +94,6 @@ func getNdkFullTimestampFile(ctx android.PathContext) android.WritablePath {
return android.PathForOutput(ctx, "ndk.timestamp")
}
// Replace ndk_base.timestamp and ndk.timestamp with ndk_headers.timestamp.
func skipNdkLibraryDeps(ctx android.ModuleContext, paths android.Paths) android.Paths {
var newPaths android.Paths
baseTimestamp := getNdkBaseTimestampFile(ctx)
fullTimestamp := getNdkFullTimestampFile(ctx)
headersTimestamp := getNdkHeadersTimestampFile(ctx)
for _, path := range paths {
if path == baseTimestamp || path == fullTimestamp {
path = headersTimestamp
}
newPaths = append(newPaths, path)
}
return newPaths
}
func NdkSingleton() android.Singleton {
return &ndkSingleton{}
}