From b31a833c8e751392eaa757bca44e6db7b7a855ee Mon Sep 17 00:00:00 2001
From: Zi Wang <mrziwang@google.com>
Date: Mon, 6 Mar 2023 15:21:35 -0800
Subject: [PATCH] Incorporate Bazel-built fingerprint file into mixed builds

Test: m and TH

Bug: 268337233
Merged-In: Ib2f7fa35b2d94972869e8e85be47b288ff875408
Change-Id: Ia2670ebc0b1b4b720e79281fe81235555d498789
---
 android/allowlists/allowlists.go | 7 ++++++-
 java/sdk.go                      | 9 +++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go
index af24beaac..63495bc99 100644
--- a/android/allowlists/allowlists.go
+++ b/android/allowlists/allowlists.go
@@ -695,6 +695,9 @@ var (
 		"non-updatable-system-current.txt",
 		"non-updatable-module-lib-current.txt",
 		"non-updatable-system-server-current.txt",
+
+		// for api_fingerprint.txt generation
+		"api_fingerprint",
 	}
 
 	Bp2buildModuleTypeAlwaysConvertList = []string{
@@ -1436,7 +1439,9 @@ var (
 	// which will soon be added to the prod allowlist.
 	// It is implicit that all modules in ProdMixedBuildsEnabledList will
 	// also be built - do not add them to this list.
-	StagingMixedBuildsEnabledList = []string{}
+	StagingMixedBuildsEnabledList = []string{
+		"api_fingerprint",
+	}
 
 	// These should be the libs that are included by the apexes in the ProdMixedBuildsEnabledList
 	ProdDclaMixedBuildsEnabledList = []string{}
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