commit 2acdae88531f9f4b297c488ffbbc1b7419587f9f
author Colin Cross <ccross@android.com> Fri Sep 15 19:44:24 2017 -0700
committer Colin Cross <ccross@android.com> Wed Sep 20 13:20:45 2017 -0700
tree ec19d506743a04f209ea6f5c1c6d20ea6b56ab3f
parent 4c428dfb283a8339e0c6e9c8225851f88639c21d

Fix java sdk tests

Fix the java module sdk tests, and expand them to cover testing
all classpaths including for the host.

Test: java_test.go
Change-Id: I71be13cc5545f5c4d5b377c4c8de3dccbb09abf9

java/java.go

diff --git a/java/java.go b/java/java.go
index 41da3fc..2ded80b 100644
--- a/java/java.go
+++ b/java/java.go
@@ -713,9 +713,11 @@
 func SdkPrebuiltFactory() android.Module {
 	module := &sdkPrebuilt{}
 
-	module.AddProperties(&module.sdkProperties)
+	module.AddProperties(
+		&module.sdkProperties,
+		&module.Import.properties)
 
-	android.InitPrebuiltModule(module, &module.properties.Jars)
+	android.InitPrebuiltModule(module, &module.Import.properties.Jars)
 	android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
 	return module
 }