Merge "Don't enforce ordering for ABI validation."

2021-06-15 21:41:57 +00:00
parent f9d141ee9a 4922703e86
commit 45d7289e7c
1 changed files with 5 additions and 5 deletions
--- a/cc/ndk_sysroot.go
+++ b/cc/ndk_sysroot.go
@@ -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))