Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d824cc8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove dependency on framework.jar"

parents f576fcd4 ba49360c

java/droiddoc.go

+1 −1
Original line number Diff line number Diff line
@@ -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

java/sdk_library.go

+0 −5
Original line number Diff line number Diff line
@@ -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)