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

Commit ec90e44c authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes Icfd32d0a,Icc9ff4d4,Ieee07502,I559eeb1f,Iaf2a6f6d, ... 

* changes:
  Use java language 1.9 for sdk_version: "current"
  Remove special case for sdk_version: "none"
  Use system modules for turbine
  Make javaVersion an enum
  Move TestConfig sdk versions forward
  Split java 8 and 9 classpaths in TestClasspath
parents 657615e0 6cef481e

android/config.go

+2 −2
Original line number Diff line number Diff line
@@ -212,9 +212,9 @@ func TestConfig(buildDir string, env map[string]string) Config { 
	config := &config{

		productVariables: productVariables{

			DeviceName:                  stringPtr("test_device"),

			Platform_sdk_version:        intPtr(26),

			Platform_sdk_version:        intPtr(30),

			DeviceSystemSdkVersions:     []string{"14", "15"},

			Platform_systemsdk_versions: []string{"25", "26"},

			Platform_systemsdk_versions: []string{"29", "30"},

			AAPTConfig:                  []string{"normal", "large", "xlarge", "hdpi", "xhdpi", "xxhdpi"},

			AAPTPreferredConfig:         stringPtr("xhdpi"),

			AAPTCharacteristics:         stringPtr("nosdcard"),

java/aar.go

+4 −0
Original line number Diff line number Diff line
@@ -538,6 +538,10 @@ func (a *AARImport) targetSdkVersion() string { 
	return a.sdkVersion()

}



func (a *AARImport) javaVersion() string {

	return ""

}



var _ AndroidLibraryDependency = (*AARImport)(nil)



func (a *AARImport) ExportPackage() android.Path {

java/builder.go

+55 −27
Original line number Diff line number Diff line
@@ -185,12 +185,13 @@ type javaBuilderFlags struct { 
	javacFlags     string

	bootClasspath  classpath

	classpath      classpath

	java9Classpath classpath

	processorPath  classpath

	processor      string

	systemModules  *systemModules

	aidlFlags      string

	aidlDeps       android.Paths

	javaVersion   string

	javaVersion    javaVersion



	errorProneExtraJavacFlags string

	errorProneProcessorPath   classpath
@@ -239,7 +240,7 @@ func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath, idx 
	deps = append(deps, srcJars...)



	var bootClasspath string

	if flags.javaVersion == "1.9" {

	if flags.javaVersion.usesJavaModules() {

		var systemModuleDeps android.Paths

		bootClasspath, systemModuleDeps = flags.systemModules.FormJavaSystemModulesPath(ctx.Device())

		deps = append(deps, systemModuleDeps...)
@@ -279,7 +280,7 @@ func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath, idx 
				"bootClasspath": bootClasspath,

				"classpath":     flags.classpath.FormJavaClassPath("-classpath"),

				"javacFlags":    flags.javacFlags,

				"javaVersion":   flags.javaVersion,

				"javaVersion":   flags.javaVersion.String(),

				"outDir":        android.PathForModuleOut(ctx, "javac", "classes.xref").String(),

				"processorpath": flags.processorPath.FormJavaClassPath("-processorpath"),

				"processor":     processor,
@@ -294,17 +295,28 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. 


	var deps android.Paths

	deps = append(deps, srcJars...)

	deps = append(deps, flags.bootClasspath...)

	deps = append(deps, flags.classpath...)



	classpath := flags.classpath



	var bootClasspath string

	if flags.javaVersion.usesJavaModules() {

		var systemModuleDeps android.Paths

		bootClasspath, systemModuleDeps = flags.systemModules.FormTurbineSystemModulesPath(ctx.Device())

		deps = append(deps, systemModuleDeps...)

		classpath = append(flags.java9Classpath, classpath...)

	} else {

		deps = append(deps, flags.bootClasspath...)

		if len(flags.bootClasspath) == 0 && ctx.Device() {

			// explicitly specify -bootclasspath "" if the bootclasspath is empty to

		// ensure java does not fall back to the default bootclasspath.

			// ensure turbine does not fall back to the default bootclasspath.

			bootClasspath = `--bootclasspath ""`

		} else {

			bootClasspath = strings.Join(flags.bootClasspath.FormTurbineClasspath("--bootclasspath "), " ")

		}

	}



	deps = append(deps, classpath...)

	deps = append(deps, flags.processorPath...)



	ctx.Build(pctx, android.BuildParams{

		Rule:        turbine,
@@ -316,9 +328,9 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. 
			"javacFlags":    flags.javacFlags,

			"bootClasspath": bootClasspath,

			"srcJars":       strings.Join(srcJars.Strings(), " "),

			"classpath":     strings.Join(flags.classpath.FormTurbineClasspath("--classpath "), " "),

			"classpath":     strings.Join(classpath.FormTurbineClasspath("--classpath "), " "),

			"outDir":        android.PathForModuleOut(ctx, "turbine", "classes").String(),

			"javaVersion":   flags.javaVersion,

			"javaVersion":   flags.javaVersion.String(),

		},

	})

}
@@ -339,11 +351,14 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab 


	deps = append(deps, srcJars...)



	classpath := flags.classpath



	var bootClasspath string

	if flags.javaVersion == "1.9" {

	if flags.javaVersion.usesJavaModules() {

		var systemModuleDeps android.Paths

		bootClasspath, systemModuleDeps = flags.systemModules.FormJavaSystemModulesPath(ctx.Device())

		deps = append(deps, systemModuleDeps...)

		classpath = append(flags.java9Classpath, classpath...)

	} else {

		deps = append(deps, flags.bootClasspath...)

		if len(flags.bootClasspath) == 0 && ctx.Device() {
@@ -355,7 +370,7 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab 
		}

	}



	deps = append(deps, flags.classpath...)

	deps = append(deps, classpath...)

	deps = append(deps, flags.processorPath...)



	processor := "-proc:none"
@@ -381,14 +396,14 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab 
		Args: map[string]string{

			"javacFlags":    flags.javacFlags,

			"bootClasspath": bootClasspath,

			"classpath":     flags.classpath.FormJavaClassPath("-classpath"),

			"classpath":     classpath.FormJavaClassPath("-classpath"),

			"processorpath": flags.processorPath.FormJavaClassPath("-processorpath"),

			"processor":     processor,

			"srcJars":       strings.Join(srcJars.Strings(), " "),

			"srcJarDir":     android.PathForModuleOut(ctx, intermediatesDir, srcJarDir).String(),

			"outDir":        android.PathForModuleOut(ctx, intermediatesDir, outDir).String(),

			"annoDir":       android.PathForModuleOut(ctx, intermediatesDir, annoDir).String(),

			"javaVersion":   flags.javaVersion,

			"javaVersion":   flags.javaVersion.String(),

		},

	})

}
@@ -550,9 +565,9 @@ type systemModules struct { 
	deps android.Paths

}



// Returns a --system argument in the form javac expects with -source 1.9.  If forceEmpty is true,

// returns --system=none if the list is empty to ensure javac does not fall back to the default

// system modules.

// Returns a --system argument in the form javac expects with -source 1.9 and the list of files to

// depend on.  If forceEmpty is true, returns --system=none if the list is empty to ensure javac

// does not fall back to the default system modules.

func (x *systemModules) FormJavaSystemModulesPath(forceEmpty bool) (string, android.Paths) {

	if x != nil {

		return "--system=" + x.dir.String(), x.deps
@@ -562,3 +577,16 @@ func (x *systemModules) FormJavaSystemModulesPath(forceEmpty bool) (string, andr 
		return "", nil

	}

}



// Returns a --system argument in the form turbine expects with -source 1.9 and the list of files to

// depend on.  If forceEmpty is true, returns --bootclasspath "" if the list is empty to ensure turbine

// does not fall back to the default bootclasspath.

func (x *systemModules) FormTurbineSystemModulesPath(forceEmpty bool) (string, android.Paths) {

	if x != nil {

		return "--system " + x.dir.String(), x.deps

	} else if forceEmpty {

		return `--bootclasspath ""`, nil

	} else {

		return "", nil

	}

}

java/droiddoc.go

+20 −17
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ func (j *Javadoc) targetSdkVersion() string { 
func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) {

	if ctx.Device() {

		sdkDep := decodeSdkDep(ctx, sdkContext(j))

		if sdkDep.hasStandardLibs() {

		if sdkDep.useDefaultLibs {

			ctx.AddVariationDependencies(nil, bootClasspathTag, config.DefaultBootclasspathLibraries...)

			ctx.AddVariationDependencies(nil, systemModulesTag, config.DefaultSystemModules)
@@ -430,13 +429,9 @@ func (j *Javadoc) addDeps(ctx android.BottomUpMutatorContext) { 
				ctx.AddVariationDependencies(nil, libTag, config.DefaultLibraries...)

			}

		} else if sdkDep.useModule {

			ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.bootclasspath...)

			ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)

				ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.modules...)

			}

		} else if sdkDep.systemModules != "" {

			// Add the system modules to both the system modules and bootclasspath.

			ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)

			ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.systemModules)

			ctx.AddVariationDependencies(nil, java9LibTag, sdkDep.java9Classpath...)

		}

	}
@@ -511,7 +506,8 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps { 


	sdkDep := decodeSdkDep(ctx, sdkContext(j))

	if sdkDep.invalidVersion {

		ctx.AddMissingDependencies(sdkDep.modules)

		ctx.AddMissingDependencies(sdkDep.bootclasspath)

		ctx.AddMissingDependencies(sdkDep.java9Classpath)

	} else if sdkDep.useFiles {

		deps.bootClasspath = append(deps.bootClasspath, sdkDep.jars...)

	}
@@ -544,6 +540,13 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps { 
			default:

				ctx.ModuleErrorf("depends on non-java module %q", otherName)

			}

		case java9LibTag:

			switch dep := module.(type) {

			case Dependency:

				deps.java9Classpath = append(deps.java9Classpath, dep.HeaderJars()...)

			default:

				ctx.ModuleErrorf("depends on non-java module %q", otherName)

			}

		case systemModulesTag:

			if deps.systemModules != nil {

				panic("Found two system module dependencies")
@@ -665,7 +668,7 @@ func (j *Javadoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	cmd := javadocSystemModulesCmd(ctx, rule, j.srcFiles, outDir, srcJarDir, srcJarList,

		deps.systemModules, deps.classpath, j.sourcepaths)



	cmd.FlagWithArg("-source ", javaVersion).

	cmd.FlagWithArg("-source ", javaVersion.String()).

		Flag("-J-Xmx1024m").

		Flag("-XDignore.symbol.file").

		Flag("-Xdoclint:none")
@@ -1432,12 +1435,12 @@ func (d *Droidstubs) apiToXmlFlags(ctx android.ModuleContext, cmd *android.RuleB 
	}

}



func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersion string, srcs android.Paths,

func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersion javaVersion, srcs android.Paths,

	srcJarList android.Path, bootclasspath, classpath classpath, sourcepaths android.Paths) *android.RuleBuilderCommand {

	cmd := rule.Command().BuiltTool(ctx, "metalava").

		Flag(config.JavacVmFlags).

		FlagWithArg("-encoding ", "UTF-8").

		FlagWithArg("-source ", javaVersion).

		FlagWithArg("-source ", javaVersion.String()).

		FlagWithRspFileInputList("@", srcs).

		FlagWithInput("@", srcJarList)

java/java.go

+76 −48
Original line number Diff line number Diff line
@@ -140,10 +140,10 @@ type CompilerProperties struct { 
	Use_tools_jar *bool



	Openjdk9 struct {

		// List of source files that should only be used when passing -source 1.9

		// List of source files that should only be used when passing -source 1.9 or higher

		Srcs []string `android:"path"`



		// List of javac flags that should only be used when passing -source 1.9

		// List of javac flags that should only be used when passing -source 1.9 or higher

		Javacflags []string

	}
@@ -433,6 +433,7 @@ type jniDependencyTag struct { 
var (

	staticLibTag          = dependencyTag{name: "staticlib"}

	libTag                = dependencyTag{name: "javalib"}

	java9LibTag           = dependencyTag{name: "java9lib"}

	pluginTag             = dependencyTag{name: "plugin"}

	bootClasspathTag      = dependencyTag{name: "bootclasspath"}

	systemModulesTag      = dependencyTag{name: "system modules"}
@@ -461,12 +462,16 @@ type checkVendorModuleContext interface { 
type sdkDep struct {

	useModule, useFiles, useDefaultLibs, invalidVersion bool



	modules []string

	// The modules that will be added to the bootclasspath when targeting 1.8 or lower

	bootclasspath []string



	// The default system modules to use. Will be an empty string if no system

	// modules are to be used.

	systemModules string



	// The modules that will be added ot the classpath when targeting 1.9 or higher

	java9Classpath []string



	frameworkResModule string



	jars android.Paths
@@ -524,7 +529,6 @@ func (j *Module) targetSdkVersion() string { 
func (j *Module) deps(ctx android.BottomUpMutatorContext) {

	if ctx.Device() {

		sdkDep := decodeSdkDep(ctx, sdkContext(j))

		if sdkDep.hasStandardLibs() {

		if sdkDep.useDefaultLibs {

			ctx.AddVariationDependencies(nil, bootClasspathTag, config.DefaultBootclasspathLibraries...)

			ctx.AddVariationDependencies(nil, systemModulesTag, config.DefaultSystemModules)
@@ -532,18 +536,15 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { 
				ctx.AddVariationDependencies(nil, libTag, config.DefaultLibraries...)

			}

		} else if sdkDep.useModule {

			ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.bootclasspath...)

			ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)

				ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.modules...)

				if j.deviceProperties.EffectiveOptimizeEnabled() {

			ctx.AddVariationDependencies(nil, java9LibTag, sdkDep.java9Classpath...)

			if j.deviceProperties.EffectiveOptimizeEnabled() && sdkDep.hasStandardLibs() {

				ctx.AddVariationDependencies(nil, proguardRaiseTag, config.DefaultBootclasspathLibraries...)

				ctx.AddVariationDependencies(nil, proguardRaiseTag, config.DefaultLibraries...)

			}

		}

		} else if sdkDep.systemModules != "" {

			// Add the system modules to both the system modules and bootclasspath.

			ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)

			ctx.AddVariationDependencies(nil, bootClasspathTag, sdkDep.systemModules)

		}



		if ctx.ModuleName() == "android_stubs_current" ||

			ctx.ModuleName() == "android_system_stubs_current" ||

			ctx.ModuleName() == "android_test_stubs_current" {
@@ -635,6 +636,7 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt 


type deps struct {

	classpath          classpath

	java9Classpath     classpath

	bootClasspath      classpath

	processorPath      classpath

	processorClasses   []string
@@ -744,7 +746,8 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { 
	if ctx.Device() {

		sdkDep := decodeSdkDep(ctx, sdkContext(j))

		if sdkDep.invalidVersion {

			ctx.AddMissingDependencies(sdkDep.modules)

			ctx.AddMissingDependencies(sdkDep.bootclasspath)

			ctx.AddMissingDependencies(sdkDep.java9Classpath)

		} else if sdkDep.useFiles {

			// sdkDep.jar is actually equivalent to turbine header.jar.

			deps.classpath = append(deps.classpath, sdkDep.jars...)
@@ -792,6 +795,8 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { 
				// sdk lib names from dependencies are re-exported

				j.exportedSdkLibs = append(j.exportedSdkLibs, dep.ExportedSdkLibs()...)

				deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, dep.AidlIncludeDirs()...)

			case java9LibTag:

				deps.java9Classpath = append(deps.java9Classpath, dep.HeaderJars()...)

			case staticLibTag:

				deps.classpath = append(deps.classpath, dep.HeaderJars()...)

				deps.staticJars = append(deps.staticJars, dep.ImplementationJars()...)
@@ -865,8 +870,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { 
	return deps

}



func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sdkContext) string {

	var ret string

func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sdkContext) javaVersion {

	v := sdkContext.sdkVersion()

	// For PDK builds, use the latest SDK version instead of "current"

	if ctx.Config().IsPdkBuild() &&
@@ -884,41 +888,65 @@ func getJavaVersion(ctx android.ModuleContext, javaVersion string, sdkContext sd 
		ctx.PropertyErrorf("sdk_version", "%s", err)

	}

	if javaVersion != "" {

		ret = normalizeJavaVersion(ctx, javaVersion)

		return normalizeJavaVersion(ctx, javaVersion)

	} else if ctx.Device() && sdk <= 23 {

		ret = "1.7"

		return JAVA_VERSION_7

	} else if ctx.Device() && sdk <= 29 {

		ret = "1.8"

	} else if ctx.Device() &&

		sdkContext.sdkVersion() != "" &&

		sdkContext.sdkVersion() != "none" &&

		sdkContext.sdkVersion() != "core_platform" &&

		sdk == android.FutureApiLevel {

		// TODO(ccross): once we generate stubs we should be able to use 1.9 for sdk_version: "current"

		ret = "1.8"

		return JAVA_VERSION_8

	} else if ctx.Device() && ctx.Config().UnbundledBuildUsePrebuiltSdks() {

		// TODO(b/142896162): once we have prebuilt system modules we can use 1.9 for unbundled builds

		return JAVA_VERSION_8

	} else {

		ret = "1.9"

		return JAVA_VERSION_9

	}

}



	return ret

type javaVersion int



const (

	JAVA_VERSION_UNSUPPORTED = 0

	JAVA_VERSION_6           = 6

	JAVA_VERSION_7           = 7

	JAVA_VERSION_8           = 8

	JAVA_VERSION_9           = 9

)



func (v javaVersion) String() string {

	switch v {

	case JAVA_VERSION_6:

		return "1.6"

	case JAVA_VERSION_7:

		return "1.7"

	case JAVA_VERSION_8:

		return "1.8"

	case JAVA_VERSION_9:

		return "1.9"

	default:

		return "unsupported"

	}

}



// Returns true if javac targeting this version uses system modules instead of a bootclasspath.

func (v javaVersion) usesJavaModules() bool {

	return v >= 9

}



func normalizeJavaVersion(ctx android.ModuleContext, javaVersion string) string {

func normalizeJavaVersion(ctx android.BaseModuleContext, javaVersion string) javaVersion {

	switch javaVersion {

	case "1.6", "6":

		return "1.6"

		return JAVA_VERSION_6

	case "1.7", "7":

		return "1.7"

		return JAVA_VERSION_7

	case "1.8", "8":

		return "1.8"

		return JAVA_VERSION_8

	case "1.9", "9":

		return "1.9"

		return JAVA_VERSION_9

	case "10", "11":

		ctx.PropertyErrorf("java_version", "Java language levels above 9 are not supported")

		return "unsupported"

		return JAVA_VERSION_UNSUPPORTED

	default:

		ctx.PropertyErrorf("java_version", "Unrecognized Java language level")

		return "unrecognized"

		return JAVA_VERSION_UNSUPPORTED

	}

}
@@ -931,7 +959,7 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB 


	// javac flags.

	javacFlags := j.properties.Javacflags

	if flags.javaVersion == "1.9" {

	if flags.javaVersion.usesJavaModules() {

		javacFlags = append(javacFlags, j.properties.Openjdk9.Javacflags...)

	}

	if ctx.Config().MinimizeJavaDebugInfo() {
@@ -959,13 +987,13 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB 
	// classpath

	flags.bootClasspath = append(flags.bootClasspath, deps.bootClasspath...)

	flags.classpath = append(flags.classpath, deps.classpath...)

	flags.java9Classpath = append(flags.java9Classpath, deps.java9Classpath...)

	flags.processorPath = append(flags.processorPath, deps.processorPath...)



	flags.processor = strings.Join(deps.processorClasses, ",")



	if len(flags.bootClasspath) == 0 && ctx.Host() && flags.javaVersion != "1.9" &&

		decodeSdkDep(ctx, sdkContext(j)).hasStandardLibs() &&

		inList(flags.javaVersion, []string{"1.6", "1.7", "1.8"}) {

	if len(flags.bootClasspath) == 0 && ctx.Host() && !flags.javaVersion.usesJavaModules() &&

		decodeSdkDep(ctx, sdkContext(j)).hasStandardLibs() {

		// Give host-side tools a version of OpenJDK's standard libraries

		// close to what they're targeting. As of Dec 2017, AOSP is only

		// bundling OpenJDK 8 and 9, so nothing < 8 is available.
@@ -989,7 +1017,7 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB 
		}

	}



	if j.properties.Patch_module != nil && flags.javaVersion == "1.9" {

	if j.properties.Patch_module != nil && flags.javaVersion.usesJavaModules() {

		// Manually specify build directory in case it is not under the repo root.

		// (javac doesn't seem to expand into symbolc links when searching for patch-module targets, so

		// just adding a symlink under the root doesn't help.)
@@ -1022,7 +1050,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
	deps := j.collectDeps(ctx)

	flags := j.collectBuilderFlags(ctx, deps)



	if flags.javaVersion == "1.9" {

	if flags.javaVersion.usesJavaModules() {

		j.properties.Srcs = append(j.properties.Srcs, j.properties.Openjdk9.Srcs...)

	}

	srcFiles := android.PathsForModuleSrcExcludes(ctx, j.properties.Srcs, j.properties.Exclude_srcs)