Merge "Don't enforce ordering for ABI validation."
This commit is contained in:
@@ -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))
|
||||||
|
Reference in New Issue
Block a user