summaryrefslogtreecommitdiff
path: root/java/java_test.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-03-20 12:51:37 -0700
committer android-build-merger <android-build-merger@google.com> 2019-03-20 12:51:37 -0700
commit5654c3f42f4c4ba36e78247bfc96d8e539b73145 (patch)
treea04189923fa68a6165e13f238f06e20a6d8d0000 /java/java_test.go
parent161277971bd642944f151f20f39a9f4fb82ffbb1 (diff)
parent5d5665174527fd42b39549f3c57ff304eee1cd84 (diff)
Add dex_import module type am: 42be761ebd am: 66f3f2a01a
am: 5d56651745 Change-Id: I6a96468ef78f5cd0c1fab335e691bcc19a8988dd
Diffstat (limited to 'java/java_test.go')
-rw-r--r--java/java_test.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go
index 3857ba848..a43f1f79e 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -79,6 +79,7 @@ func testContext(config android.Config, bp string,
ctx.RegisterModuleType("java_system_modules", android.ModuleFactoryAdaptor(SystemModulesFactory))
ctx.RegisterModuleType("java_genrule", android.ModuleFactoryAdaptor(genRuleFactory))
ctx.RegisterModuleType("java_plugin", android.ModuleFactoryAdaptor(PluginFactory))
+ ctx.RegisterModuleType("dex_import", android.ModuleFactoryAdaptor(DexImportFactory))
ctx.RegisterModuleType("filegroup", android.ModuleFactoryAdaptor(android.FileGroupFactory))
ctx.RegisterModuleType("genrule", android.ModuleFactoryAdaptor(genrule.GenRuleFactory))
ctx.RegisterModuleType("droiddoc", android.ModuleFactoryAdaptor(DroiddocFactory))
@@ -330,6 +331,11 @@ func TestPrebuilts(t *testing.T) {
name: "baz",
jars: ["b.jar"],
}
+
+ dex_import {
+ name: "qux",
+ jars: ["b.jar"],
+ }
`)
javac := ctx.ModuleForTests("foo", "android_common").Rule("javac")
@@ -344,6 +350,8 @@ func TestPrebuilts(t *testing.T) {
if len(combineJar.Inputs) != 2 || combineJar.Inputs[1].String() != bazJar.String() {
t.Errorf("foo combineJar inputs %v does not contain %q", combineJar.Inputs, bazJar.String())
}
+
+ ctx.ModuleForTests("qux", "android_common").Rule("Cp")
}
func TestDefaults(t *testing.T) {