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

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

View File

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