From d780d48da15b20ec24a09a613588ca4e5dde9753 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 14 Feb 2025 15:16:47 -0800 Subject: Dist api fingerprint file in singleton build actions To remove our reliance on MakeVars(). Bug: 395184523 Test: Presubmits Change-Id: If3b23375884e6e9df3cb1ae0f3d22f9c4d568de5 --- java/sdk.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/sdk.go') diff --git a/java/sdk.go b/java/sdk.go index 4960ab576..27b2434c5 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -381,6 +381,10 @@ func createAPIFingerprint(ctx android.SingletonContext) { } rule.Build("api_fingerprint", "generate api_fingerprint.txt") + + if ctx.Config().BuildOS == android.Linux { + ctx.DistForGoals([]string{"sdk", "droidcore"}, out) + } } func sdkMakeVars(ctx android.MakeVarsContext) { @@ -390,8 +394,4 @@ func sdkMakeVars(ctx android.MakeVarsContext) { ctx.Strict("FRAMEWORK_AIDL", sdkFrameworkAidlPath(ctx).String()) ctx.Strict("API_FINGERPRINT", android.ApiFingerprintPath(ctx).String()) - - if ctx.Config().BuildOS == android.Linux { - ctx.DistForGoals([]string{"sdk", "droidcore"}, android.ApiFingerprintPath(ctx)) - } } -- cgit v1.2.3-59-g8ed1b