diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-07-10 11:02:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-10 11:02:59 +0000 |
| commit | 4599ec5b0b9510cea98d406631a47c5df32cac42 (patch) | |
| tree | 2618e9ed266760d70f31450b803773487a7abefb | |
| parent | 76c3de1ceaefee3a3a167e790e76fa89d60dd32e (diff) | |
| parent | b1c697d03e48060f9864915f5bdda174523e8219 (diff) | |
| download | build_soong-4599ec5b0b9510cea98d406631a47c5df32cac42.tar.gz build_soong-4599ec5b0b9510cea98d406631a47c5df32cac42.tar.bz2 build_soong-4599ec5b0b9510cea98d406631a47c5df32cac42.zip | |
Merge "Generate system modules for any value of EXPERIMENTAL_USE_OPENJDK9."
| -rw-r--r-- | java/system_modules.go | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/java/system_modules.go b/java/system_modules.go index 943eaeb8..73a51312 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -119,9 +119,7 @@ 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) - } + system.outputFile = TransformJarsToSystemModules(ctx, "java.base", jars) } func (system *SystemModules) DepsMutator(ctx android.BottomUpMutatorContext) { @@ -131,17 +129,15 @@ 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()) - fmt.Fprintln(w, ".KATI_READONLY", ":=", makevar) - fmt.Fprintln(w, name+":", "$("+makevar+")") - fmt.Fprintln(w) - makevar = "SOONG_SYSTEM_MODULES_LIBS_" + name - fmt.Fprintln(w, makevar, ":=", strings.Join(system.properties.Libs, " ")) - fmt.Fprintln(w, ".KATI_READONLY :=", makevar) - } + makevar := "SOONG_SYSTEM_MODULES_" + name + fmt.Fprintln(w) + fmt.Fprintln(w, makevar, ":=", system.outputFile.String()) + fmt.Fprintln(w, ".KATI_READONLY", ":=", makevar) + fmt.Fprintln(w, name+":", "$("+makevar+")") + fmt.Fprintln(w) + makevar = "SOONG_SYSTEM_MODULES_LIBS_" + name + fmt.Fprintln(w, makevar, ":=", strings.Join(system.properties.Libs, " ")) + fmt.Fprintln(w, ".KATI_READONLY :=", makevar) }, } } |