From e323f3cca30696f16008f445c0d4c97e10e994fc Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 17 Sep 2019 15:34:09 -0700
Subject: Fix robolectric tests with sdk_version and prebuilt dependencies

Add deviceProperties to robolectric tests so they can set
sdk_version.  Use Dependency.BaseModuleName() instead of
ctx.OtherModuleName() to get the dependency name to pass to Make
to support prebuilts in libs, which may have a "prebuilt_" prefix
in ctx.OtherModuleName().

Test: m RunLauncherRoboTests
Change-Id: I59a889bd6107b989f336b147d0eaccabef611894
---
 java/java.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'java/java.go')

diff --git a/java/java.go b/java/java.go
index b05d7bbd5..b0fc9db6c 100644
--- a/java/java.go
+++ b/java/java.go
@@ -398,6 +398,7 @@ type Dependency interface {
 	AidlIncludeDirs() android.Paths
 	ExportedSdkLibs() []string
 	SrcJarArgs() ([]string, android.Paths)
+	BaseModuleName() string
 }
 
 type SdkLibraryDependency interface {
-- 
cgit v1.2.3-59-g8ed1b