Dist api fingerprint file in singleton build actions
To remove our reliance on MakeVars().
Bug: 395184523
Test: Presubmits
Change-Id: If3b23375884e6e9df3cb1ae0f3d22f9c4d568de5
diff --git a/java/sdk.go b/java/sdk.go
index 4960ab5..27b2434 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -381,6 +381,10 @@
}
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 @@
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))
- }
}