Merge "Generate system modules for any value of EXPERIMENTAL_USE_OPENJDK9." (4599ec5b) · Commits · e / os / android_build_soong

java/system_modules.go

+10 −14

Original line number	Diff line number	Diff line
		@@ -119,10 +119,8 @@ func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleConte

		jars = append(jars, android.PathsForModuleSrc(ctx, system.properties.Jars)...)

		if ctx.Config().TargetOpenJDK9() {
		system.outputFile = TransformJarsToSystemModules(ctx, "java.base", jars)
		}
		}

		func (system *SystemModules) DepsMutator(ctx android.BottomUpMutatorContext) {
		ctx.AddDependency(ctx.Module(), libTag, system.properties.Libs...)
		@@ -131,7 +129,6 @@ func (system *SystemModules) DepsMutator(ctx android.BottomUpMutatorContext) {
		func (system *SystemModules) AndroidMk() android.AndroidMkData {
		return android.AndroidMkData{
		Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
		if system.outputFile != nil {
		makevar := "SOONG_SYSTEM_MODULES_" + name
		fmt.Fprintln(w)
		fmt.Fprintln(w, makevar, ":=", system.outputFile.String())
		@@ -141,7 +138,6 @@ func (system *SystemModules) AndroidMk() android.AndroidMkData {
		makevar = "SOONG_SYSTEM_MODULES_LIBS_" + name
		fmt.Fprintln(w, makevar, ":=", strings.Join(system.properties.Libs, " "))
		fmt.Fprintln(w, ".KATI_READONLY :=", makevar)
		}
		},
		}
		}