diff options
| author | 2025-02-06 22:14:19 +0000 | |
|---|---|---|
| committer | 2025-02-07 19:32:46 +0000 | |
| commit | 409a6436df71f92d53e4a894b4df8c93616f34dc (patch) | |
| tree | 77ee4dfe82a18ced4ad9f0f3d426408c968e222a | |
| parent | 1c6fcf52bec6968bb102e83851e6d78ed92fdaba (diff) | |
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
| -rw-r--r-- | android/makevars.go | 1 | ||||
| -rw-r--r-- | java/sdk.go | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/android/makevars.go b/android/makevars.go index d4389cfac..c8eb5e436 100644 --- a/android/makevars.go +++ b/android/makevars.go @@ -651,6 +651,7 @@ func (c *makeVarsContext) DistForGoals(goals []string, paths ...Path) { 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 bb2aa8d7e..4960ab576 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -390,4 +390,8 @@ 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)) + } } |