diff options
| author | 2023-03-06 15:21:35 -0800 | |
|---|---|---|
| committer | 2023-03-07 15:33:05 -0800 | |
| commit | b31a833c8e751392eaa757bca44e6db7b7a855ee (patch) | |
| tree | 6c114f2a83915e657940192cb922495ebb26a1f4 /java/sdk.go | |
| parent | dd2e32d8594da1a436043695887f9cead237f74a (diff) | |
Incorporate Bazel-built fingerprint file into mixed builds
Test: m and TH
Bug: 268337233
Merged-In: Ib2f7fa35b2d94972869e8e85be47b288ff875408
Change-Id: Ia2670ebc0b1b4b720e79281fe81235555d498789
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/java/sdk.go b/java/sdk.go index 10ae3f6e8..855e5598a 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -384,10 +384,7 @@ func createAPIFingerprint(ctx android.SingletonContext) { } else if ctx.Config().FrameworksBaseDirExists(ctx) && !ctx.Config().AlwaysUsePrebuiltSdks() { cmd.Text("cat") apiTxtFileModules := []string{ - "frameworks-base-api-current.txt", - "frameworks-base-api-system-current.txt", - "frameworks-base-api-module-lib-current.txt", - "frameworks-base-api-system-server-current.txt", + "api_fingerprint", } count := 0 ctx.VisitAllModules(func(module android.Module) { @@ -398,10 +395,10 @@ func createAPIFingerprint(ctx android.SingletonContext) { } }) if count != len(apiTxtFileModules) { - ctx.Errorf("Could not find all the expected API modules %v, found %d\n", apiTxtFileModules, count) + ctx.Errorf("Could not find expected API module %v, found %d\n", apiTxtFileModules, count) return } - cmd.Text("| md5sum | cut -d' ' -f1 >"). + cmd.Text(">"). Output(out) } else { // Unbundled build |