diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-01-10 16:06:12 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-02-22 11:14:13 -0800 |
| commit | 581fd21e9111138359d1685c3fea59e3466b2b58 (patch) | |
| tree | 65b5fe896f3aa618a79ad2ed5b8dee4deed3f2dc /java/java.go | |
| parent | 50b8682dcac9757783231ac23a3ae796d8f0f0ca (diff) | |
| download | build_soong-581fd21e9111138359d1685c3fea59e3466b2b58.tar.gz build_soong-581fd21e9111138359d1685c3fea59e3466b2b58.tar.bz2 build_soong-581fd21e9111138359d1685c3fea59e3466b2b58.zip | |
Droiddoc Support in Soong
Support Droiddoc to Soong based on core/droiddoc.mk. The non-std doclet
based droiddoc compilation output is a "real" stubs.jar instead of a
directory of java files and a timestamp file.
The std doclet based javadoc compilation output is a "empty" stubs.jar
instead of a timestamp file.
The stubs.jar will be exported to
out/target/common/obj/JAVA_LIBRARIES/$(LOCAL_MODULE)_intermediates/classes.jar
and out/target/common/docs/$(LOCAL_MODULE)-stubs.jar
A $(LOCAL_MODULE).zip file will be generated also, and is exported to
out/target/common/docs/$(LOCAL_MODULE)-docs.zip if property: installable is not set
to false.
Bug: b/70351683
Test: unittest + convert libcore docs Android.mk to Soong manually.
Change-Id: I1cffddd138a5d9d445f86a3d4a3fd4de88a2bc0f
(cherry picked from commit 78188ec622cb1ee24171455867fc58ffab91562e)
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/java.go b/java/java.go index 65bd4383..4a7d7043 100644 --- a/java/java.go +++ b/java/java.go @@ -538,8 +538,8 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt } type deps struct { - classpath android.Paths - bootClasspath android.Paths + classpath classpath + bootClasspath classpath staticJars android.Paths staticHeaderJars android.Paths staticJarResources android.Paths @@ -688,8 +688,8 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB } // classpath - flags.bootClasspath.AddPaths(deps.bootClasspath) - flags.classpath.AddPaths(deps.classpath) + flags.bootClasspath = append(flags.bootClasspath, deps.bootClasspath...) + flags.classpath = append(flags.classpath, deps.classpath...) if len(flags.bootClasspath) == 0 && ctx.Host() && !ctx.Config().TargetOpenJDK9() && !Bool(j.properties.No_standard_libs) && @@ -836,7 +836,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path } if enable_sharding { - flags.classpath.AddPaths([]android.Path{j.headerJarFile}) + flags.classpath = append(flags.classpath, j.headerJarFile) shardSize := int(*(j.properties.Javac_shard_size)) var shardSrcs []android.Paths if len(uniqueSrcFiles) > 0 { |