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

Make :module provide the output file for java modules am: 3063b78ea5 am: 976957aa2c

Browse Source 
am: 5bc2fd8921

Change-Id: I8160beeba8a2734d72146990f62be135ae217a93
This commit is contained in:
Colin Cross
2018-08-16 23:50:28 -07:00
committed by android-build-merger
parent 655cc9e674 5bc2fd8921
commit 117a108f9b
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/paths.go
View File

@@ -663,6 +663,11 @@ func (p OutputPath) withRel(rel string) OutputPath {
return p
}
func (p OutputPath) WithoutRel() OutputPath {
p.basePath.rel = filepath.Base(p.basePath.path)
return p
}
var _ Path = OutputPath{}
// PathForOutput joins the provided paths and returns an OutputPath that is

1
java/builder.go
View File

@@ -125,6 +125,7 @@ var (
)
func init() {
pctx.Import("android/soong/common")
pctx.Import("android/soong/java/config")
}

2
java/dex.go
View File

@@ -140,7 +140,7 @@ func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8F
}
func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
classesJar android.Path, jarName string) android.Path {
classesJar android.Path, jarName string) android.ModuleOutPath {
useR8 := Bool(j.deviceProperties.Optimize.Enabled)

36
java/java.go
View File

@@ -300,7 +300,7 @@ type Module struct {
}
func (j *Module) Srcs() android.Paths {
return android.Paths{j.implementationJarFile}
return android.Paths{j.outputFile}
}
var _ android.SourceFileProducer = (*Module)(nil)
@@ -1146,14 +1146,24 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
// Combine the classes built from sources, any manifests, and any static libraries into
// classes.jar. If there is only one input jar this step will be skipped.
var outputFile android.Path
var outputFile android.ModuleOutPath
if len(jars) == 1 && !manifest.Valid() {
// Optimization: skip the combine step if there is nothing to do
// TODO(ccross): this leaves any module-info.class files, but those should only come from
// prebuilt dependencies until we support modules in the platform build, so there shouldn't be
// any if len(jars) == 1.
outputFile = jars[0]
if moduleOutPath, ok := jars[0].(android.ModuleOutPath); ok {
// Optimization: skip the combine step if there is nothing to do
// TODO(ccross): this leaves any module-info.class files, but those should only come from
// prebuilt dependencies until we support modules in the platform build, so there shouldn't be
// any if len(jars) == 1.
outputFile = moduleOutPath
} else {
combinedJar := android.PathForModuleOut(ctx, "combined", jarName)
ctx.Build(pctx, android.BuildParams{
Rule: android.Cp,
Input: jars[0],
Output: combinedJar,
})
outputFile = combinedJar
}
} else {
combinedJar := android.PathForModuleOut(ctx, "combined", jarName)
TransformJarsToJar(ctx, combinedJar, "for javac", jars, manifest,
@@ -1198,17 +1208,17 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
}
if ctx.Device() && (Bool(j.properties.Installable) || Bool(j.deviceProperties.Compile_dex)) {
var dexOutputFile android.Path
var dexOutputFile android.ModuleOutPath
dexOutputFile = j.compileDex(ctx, flags, outputFile, jarName)
if ctx.Failed() {
return
}
if Bool(j.properties.Installable) {
outputFile = dexOutputFile
}
outputFile = dexOutputFile
}
ctx.CheckbuildFile(outputFile)
j.outputFile = outputFile
// Save the output file with no relative path so that it doesn't end up in a subdirectory when used as a resource
j.outputFile = outputFile.WithoutRel()
}
func (j *Module) compileJavaHeader(ctx android.ModuleContext, srcFiles, srcJars android.Paths,
@@ -1252,7 +1262,7 @@ func (j *Module) compileJavaHeader(ctx android.ModuleContext, srcFiles, srcJars
}
func (j *Module) instrument(ctx android.ModuleContext, flags javaBuilderFlags,
classesJar android.Path, jarName string) android.Path {
classesJar android.Path, jarName string) android.ModuleOutPath {
specs := j.jacocoModuleToZipCommand(ctx)