From 2acdae88531f9f4b297c488ffbbc1b7419587f9f Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 15 Sep 2017 19:44:24 -0700 Subject: 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 41da3fc2e..2ded80bc1 100644 --- a/java/java.go +++ b/java/java.go @@ -713,9 +713,11 @@ func (j *sdkPrebuilt) AidlPreprocessed() android.OptionalPath { 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 } -- cgit v1.2.3-59-g8ed1b