StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dependency on framework.jar

Browse Source 
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
This commit is contained in:
Sundong Ahn
2018-11-20 17:36:35 +09:00
parent d28d0ec119
commit ba49360c51
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/droiddoc.go
View File

@@ -626,7 +626,7 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
case libTag: case libTag:
switch dep := module.(type) { switch dep := module.(type) {
case Dependency: case Dependency:
deps.classpath = append(deps.classpath, dep.ImplementationJars()...) deps.classpath = append(deps.classpath, dep.HeaderJars()...)
case SdkLibraryDependency: case SdkLibraryDependency:
sdkVersion := j.sdkVersion() sdkVersion := j.sdkVersion()
linkType := javaSdk linkType := javaSdk

5
java/sdk_library.go
View File

@@ -541,11 +541,6 @@ func (module *sdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop
props.Srcs_lib_whitelist_pkgs = []string{"android.annotation"} 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 { if Bool(module.properties.Metalava_enabled) == true {
mctx.CreateModule(android.ModuleFactoryAdaptor(DroidstubsFactory), &props) mctx.CreateModule(android.ModuleFactoryAdaptor(DroidstubsFactory), &props)