From f1f738e6538a18338c5e6e4b02477e0483d7d0aa Mon Sep 17 00:00:00 2001
From: Andrei Onea <andreionea@google.com>
Date: Wed, 17 Mar 2021 13:37:19 +0000
Subject: [PATCH] Replace source based system server stubs

Use the ones obtained by merging the ones in non-updatable code, and the
ones exposed in mainline module jars that are part of
SYSTEMSERVERCLASSPATH.

Test: builds
Bug: 177640454
Change-Id: Ib4719d7eb8b76a0e5af79c1270e2f1e344682423
---
 java/sdk.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/sdk.go b/java/sdk.go
index 74d5a81a9..0baa16c3d 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -647,6 +647,7 @@ func createAPIFingerprint(ctx android.SingletonContext) {
 			"frameworks-base-api-current.txt",
 			"frameworks-base-api-system-current.txt",
 			"frameworks-base-api-module-lib-current.txt",
+			"services-system-server-current.txt",
 		}
 		count := 0
 		ctx.VisitAllModules(func(module android.Module) {
@@ -660,8 +661,7 @@ func createAPIFingerprint(ctx android.SingletonContext) {
 			ctx.Errorf("Could not find all the expected API modules %v, found %d\n", apiTxtFileModules, count)
 			return
 		}
-		cmd.Input(android.PathForSource(ctx, "frameworks/base/services/api/current.txt")).
-			Text("| md5sum | cut -d' ' -f1 >").
+		cmd.Text("| md5sum | cut -d' ' -f1 >").
 			Output(out)
 	} else {
 		// Unbundled build