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

Merge "Don't enforce ordering for ABI validation." am: 45d7289e7c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1737316

Change-Id: I6c660e138d7036a19f2974c0db2d3b675f33c9a1
This commit is contained in:
Treehugger Robot
2021-06-15 22:04:55 +00:00
committed by Automerger Merge Worker
parent 9375585937 45d7289e7c
commit d4bca70a75
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/ndk_sysroot.go
View File

@@ -144,13 +144,13 @@ func (n *ndkSingleton) GenerateBuildActions(ctx android.SingletonContext) {
Inputs: licensePaths, Inputs: licensePaths,
}) })
baseDepPaths := append(installPaths, combinedLicense, baseDepPaths := append(installPaths, combinedLicense)
getNdkAbiDiffTimestampFile(ctx))
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: android.Touch, Rule: android.Touch,
Output: getNdkBaseTimestampFile(ctx), Output: getNdkBaseTimestampFile(ctx),
Implicits: baseDepPaths, Implicits: baseDepPaths,
Validation: getNdkAbiDiffTimestampFile(ctx),
}) })
fullDepPaths := append(staticLibInstallPaths, getNdkBaseTimestampFile(ctx)) fullDepPaths := append(staticLibInstallPaths, getNdkBaseTimestampFile(ctx))