diff options
| author | Colin Cross <ccross@android.com> | 2019-02-21 18:12:14 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-03-20 19:29:59 +0000 |
| commit | 42be761ebdc3ba35bc4f7851c20d50e2acd23fde (patch) | |
| tree | 64b733bf1ad1eb4105d935809388f82e8d8ef845 /java/java_test.go | |
| parent | 1b781e52e2820d5c4e923844397c010a9e97e1d3 (diff) | |
| download | android_build_soong-42be761ebdc3ba35bc4f7851c20d50e2acd23fde.tar.gz android_build_soong-42be761ebdc3ba35bc4f7851c20d50e2acd23fde.tar.bz2 android_build_soong-42be761ebdc3ba35bc4f7851c20d50e2acd23fde.zip | |
Add dex_import module type
Add a module type for importing a prebuilt jar that contains
classes.dex files.
Test: m with a prebuilt jar that contains classes.dex files in
PRODUCT_BOOT_JARS
Test: java_test.go, dexpreopt_test.go, dexpreopt_bootjars_test.go
Bug: 124804356
Bug: 125517186
Change-Id: I496848f9dca11f758d49b1cb68168cec7f8e1718
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index 952da115..35dd696b 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) { |