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

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{}
}