aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSundong Ahn <sundongahn@google.com>2018-11-20 17:36:35 +0900
committerSundong Ahn <sundongahn@google.com>2018-12-07 02:32:40 +0000
commitba49360c51dfb4c15af244c66d8e292ce1616c12 (patch)
tree75ae09520fd0c4a6fd289019a46940757540dac6
parentd28d0ec119c78bc27e0fc4b2672e215ef9119d00 (diff)
downloadandroid_build_soong-ba49360c51dfb4c15af244c66d8e292ce1616c12.tar.gz
android_build_soong-ba49360c51dfb4c15af244c66d8e292ce1616c12.tar.bz2
android_build_soong-ba49360c51dfb4c15af244c66d8e292ce1616c12.zip
Remove dependency on framework.jar
Remove dependency on framework.jar to reduce the build time. So sdk libraries are not checked API whenever frameowkr.jar changes. Test: m -j Bug: 119625999 Change-Id: I7435c429b7857de8c3c1834757c54888091753e5
-rw-r--r--java/droiddoc.go2
-rw-r--r--java/sdk_library.go5
2 files changed, 1 insertions, 6 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 9cde1898..8e0a62a3 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -626,7 +626,7 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
case libTag:
switch dep := module.(type) {
case Dependency:
- deps.classpath = append(deps.classpath, dep.ImplementationJars()...)
+ deps.classpath = append(deps.classpath, dep.HeaderJars()...)
case SdkLibraryDependency:
sdkVersion := j.sdkVersion()
linkType := javaSdk
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 573fc8ef..fdbf19d2 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -541,11 +541,6 @@ func (module *sdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop
props.Srcs_lib_whitelist_pkgs = []string{"android.annotation"}
}
}
- // These libs are required by doclava to parse the framework sources add via
- // Src_lib and Src_lib_whitelist_* properties just above.
- // If we don't add them to the classpath, errors messages are generated by doclava,
- // though they don't break the build.
- props.Libs = append(props.Libs, "framework")
if Bool(module.properties.Metalava_enabled) == true {
mctx.CreateModule(android.ModuleFactoryAdaptor(DroidstubsFactory), &props)