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

Merge "Generate system modules for any value of EXPERIMENTAL_USE_OPENJDK9."

Browse Source
This commit is contained in:
Tobias Thierer
2018-07-10 11:02:59 +00:00
committed by Gerrit Code Review
parent 76c3de1cea b1c697d03e
commit 4599ec5b0b
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/system_modules.go
View File

@@ -119,9 +119,7 @@ func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleConte
jars = append(jars, android.PathsForModuleSrc(ctx, system.properties.Jars)...) 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) { func (system *SystemModules) DepsMutator(ctx android.BottomUpMutatorContext) {
@@ -131,7 +129,6 @@ func (system *SystemModules) DepsMutator(ctx android.BottomUpMutatorContext) {
func (system *SystemModules) AndroidMk() android.AndroidMkData { func (system *SystemModules) AndroidMk() android.AndroidMkData {
return android.AndroidMkData{ return android.AndroidMkData{
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) { Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
if system.outputFile != nil {
makevar := "SOONG_SYSTEM_MODULES_" + name makevar := "SOONG_SYSTEM_MODULES_" + name
fmt.Fprintln(w) fmt.Fprintln(w)
fmt.Fprintln(w, makevar, ":=", system.outputFile.String()) fmt.Fprintln(w, makevar, ":=", system.outputFile.String())
@@ -141,7 +138,6 @@ func (system *SystemModules) AndroidMk() android.AndroidMkData {
makevar = "SOONG_SYSTEM_MODULES_LIBS_" + name makevar = "SOONG_SYSTEM_MODULES_LIBS_" + name
fmt.Fprintln(w, makevar, ":=", strings.Join(system.properties.Libs, " ")) fmt.Fprintln(w, makevar, ":=", strings.Join(system.properties.Libs, " "))
fmt.Fprintln(w, ".KATI_READONLY :=", makevar) fmt.Fprintln(w, ".KATI_READONLY :=", makevar)
}
}, },
} }
} }