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

Make the changes to emitXrefRule matching those in aosp/1145829

Browse Source 
Test: build kzip
Bug: 121267023
Change-Id: Id3a70d113dd7c24071cbb7cbfbf138527991cb77
This commit is contained in:
Sasha Smundak
2019-11-04 16:29:45 -08:00
parent 940ef19f77
commit 09950a4f4f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/builder.go
View File

@@ -238,12 +238,14 @@ func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath, idx
flags javaBuilderFlags, deps android.Paths) { flags javaBuilderFlags, deps android.Paths) {
deps = append(deps, srcJars...) deps = append(deps, srcJars...)
classpath := flags.classpath
var bootClasspath string var bootClasspath string
if flags.javaVersion.usesJavaModules() { if flags.javaVersion.usesJavaModules() {
var systemModuleDeps android.Paths var systemModuleDeps android.Paths
bootClasspath, systemModuleDeps = flags.systemModules.FormJavaSystemModulesPath(ctx.Device()) bootClasspath, systemModuleDeps = flags.systemModules.FormJavaSystemModulesPath(ctx.Device())
deps = append(deps, systemModuleDeps...) deps = append(deps, systemModuleDeps...)
classpath = append(flags.java9Classpath, classpath...)
} else { } else {
deps = append(deps, flags.bootClasspath...) deps = append(deps, flags.bootClasspath...)
if len(flags.bootClasspath) == 0 && ctx.Device() { if len(flags.bootClasspath) == 0 && ctx.Device() {
@@ -255,7 +257,7 @@ func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath, idx
} }
} }
deps = append(deps, flags.classpath...) deps = append(deps, classpath...)
deps = append(deps, flags.processorPath...) deps = append(deps, flags.processorPath...)
processor := "-proc:none" processor := "-proc:none"
@@ -278,7 +280,7 @@ func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath, idx
Args: map[string]string{ Args: map[string]string{
"annoDir": android.PathForModuleOut(ctx, intermediatesDir, "anno").String(), "annoDir": android.PathForModuleOut(ctx, intermediatesDir, "anno").String(),
"bootClasspath": bootClasspath, "bootClasspath": bootClasspath,
"classpath": flags.classpath.FormJavaClassPath("-classpath"), "classpath": classpath.FormJavaClassPath("-classpath"),
"javacFlags": flags.javacFlags, "javacFlags": flags.javacFlags,
"javaVersion": flags.javaVersion.String(), "javaVersion": flags.javaVersion.String(),
"outDir": android.PathForModuleOut(ctx, "javac", "classes.xref").String(), "outDir": android.PathForModuleOut(ctx, "javac", "classes.xref").String(),