Incorporate Bazel-built fingerprint file into mixed builds

Test: m and TH

Bug: 268337233
Merged-In: Ib2f7fa35b2d94972869e8e85be47b288ff875408
Change-Id: Ia2670ebc0b1b4b720e79281fe81235555d498789
This commit is contained in:
Zi Wang
2023-03-06 15:21:35 -08:00
parent dd2e32d859
commit b31a833c8e
2 changed files with 9 additions and 7 deletions

View File

@@ -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