Migrate the dist rule of api_fingerprint.txt to Soong
...and remove the existing dist rule in Make to support dist'ing
api_fingerprint.txt in Make
Test: m droid dist --soong-only && ls -l out/dist/api_fingerprint.txt
Bug: 394365683
Change-Id: Ib4a8e3efe5404e6ddbf656f40e8ca9785cd6d5e7
diff --git a/android/makevars.go b/android/makevars.go
index d4389cf..c8eb5e4 100644
--- a/android/makevars.go
+++ b/android/makevars.go
@@ -651,6 +651,7 @@
for _, path := range paths {
copies = append(copies, distCopy{
from: path,
+ dest: path.Base(),
})
}
c.addDist(goals, copies)
diff --git a/java/sdk.go b/java/sdk.go
index bb2aa8d..4960ab5 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -390,4 +390,8 @@
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))
+ }
}