diff options
author | Colin Cross <ccross@android.com> | 2019-09-17 15:34:09 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2019-09-18 16:33:27 +0000 |
commit | e323f3cca30696f16008f445c0d4c97e10e994fc (patch) | |
tree | 4a7d6b7f6b4bd8fd0737e28eda0464e9a3f6b7c0 /java/java.go | |
parent | 9c27df7d4dfb1bcf26faadc7c665ea2b0ca11cd6 (diff) |
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
Diffstat (limited to 'java/java.go')
-rw-r--r-- | java/java.go | 1 |
1 files changed, 1 insertions, 0 deletions
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 { |