From 4922703e86171eafa5b8af67b03c1481e87e0816 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 15 Jun 2021 13:25:25 -0700 Subject: [PATCH] Don't enforce ordering for ABI validation. We care that these run, but they don't need to complete before we use the sysroot. Test: mm in CTS, saw ABI dump run Bug: None Change-Id: Iff1961d1ff03430d808caa83b3ca1fc1eceecfcd --- cc/ndk_sysroot.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cc/ndk_sysroot.go b/cc/ndk_sysroot.go index 4a9601bca..2726b1a3f 100644 --- 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))