From ba6ab2e791f81d1c54f10d2bd986d25a9693f3eb Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 19 Mar 2020 15:23:38 +0000
Subject: Make system_server stubs consistent with other stubs

Include the module_api stubs in system_server one instead of
putting both of these jars on the classpath. Also rename it
to be in line with the other stubs.

Bug: 149293194
Test: m
Exempt-From-Owner-Approval: approved internally
Change-Id: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
Merged-In: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
(cherry picked from commit bbd78556daf4a7e015f2e3ddfe9539909e9ebf40)
---
 java/testing.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/testing.go')

diff --git a/java/testing.go b/java/testing.go
index 5b6a39b2a..28c1a2691 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -148,7 +148,7 @@ func GatherRequiredDepsForTest() string {
 		"android_system_stubs_current",
 		"android_test_stubs_current",
 		"android_module_lib_stubs_current",
-		"services-stubs",
+		"android_system_server_stubs_current",
 		"core.current.stubs",
 		"core.platform.api.stubs",
 		"kotlin-stdlib",
-- 
cgit v1.2.3-59-g8ed1b