diff options
| author | 2023-03-08 04:06:17 +0000 | |
|---|---|---|
| committer | 2023-03-08 04:06:17 +0000 | |
| commit | f20a52657d1ffedfd88887950e02a8cc81b30dbb (patch) | |
| tree | 5acfb9cb68255467cf98e3e06c99b7ec6c569e1d /java/sdk.go | |
| parent | 6fb6b2440a5317f43c43b997ffa9a28e503ef747 (diff) | |
| parent | b31a833c8e751392eaa757bca44e6db7b7a855ee (diff) | |
Merge "Incorporate Bazel-built fingerprint file into mixed builds"
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 |