diff options
| author | Colin Cross <ccross@android.com> | 2018-06-26 17:59:05 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-07-11 05:35:59 +0000 |
| commit | 9ae1b927d46cab40a3d42945c46199471f2d541e (patch) | |
| tree | 7c2c241451dd7f6ac675af06fdc439e057338ca5 /java/java_test.go | |
| parent | f33dca0ada3908edd2db76c0f5a00be44b14d70c (diff) | |
| download | build_soong-9ae1b927d46cab40a3d42945c46199471f2d541e.tar.gz build_soong-9ae1b927d46cab40a3d42945c46199471f2d541e.tar.bz2 build_soong-9ae1b927d46cab40a3d42945c46199471f2d541e.zip | |
Don't install java libraries by default
Very few java libraries need to be installed, most are statically
included in other modules. Device modules that are not installed
also don't need to be dexed, saving checkbuild time. Change the
default for java_library to not be installed, and allow libraries
that should be installed to specify installed: true. This makes
java_libary and java_library_static identical. It also simplifies
some corner cases when converting from Make to Soong if a module
is built for the host (which doesn't differentiate between static
and non-static/installable) and statically for the device, which
couldn't be represented in a single java_library in soong.
Bug: 110885583
Test: m checkbuild, compare presubmit target files
Change-Id: Idc0841c39a17cebd7bac3559c9408596d167a393
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index 572db2f7..537bdb92 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -74,7 +74,7 @@ func testContext(config android.Config, bp string, ctx.RegisterModuleType("android_app", android.ModuleFactoryAdaptor(AndroidAppFactory)) ctx.RegisterModuleType("android_library", android.ModuleFactoryAdaptor(AndroidLibraryFactory)) ctx.RegisterModuleType("java_binary_host", android.ModuleFactoryAdaptor(BinaryHostFactory)) - ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory(true))) + ctx.RegisterModuleType("java_library", android.ModuleFactoryAdaptor(LibraryFactory)) ctx.RegisterModuleType("java_library_host", android.ModuleFactoryAdaptor(LibraryHostFactory)) ctx.RegisterModuleType("java_import", android.ModuleFactoryAdaptor(ImportFactory)) ctx.RegisterModuleType("java_defaults", android.ModuleFactoryAdaptor(defaultsFactory)) |