Use prebuilt turbine jar for unbundled javac builds.
Test: m -j Change-Id: If2ab85f8591fe7ab275a1d4fefdd80d871f2c36d
This commit is contained in:
@@ -93,10 +93,21 @@ func init() {
|
||||
return path.String(), nil
|
||||
}
|
||||
})
|
||||
pctx.VariableFunc("TurbineJar", func(config interface{}) (string, error) {
|
||||
turbine := "turbine.jar"
|
||||
if config.(android.Config).UnbundledBuild() {
|
||||
return "prebuilts/build-tools/common/framework/" + turbine, nil
|
||||
} else {
|
||||
path, err := pctx.HostJavaToolPath(config, turbine)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return path.String(), nil
|
||||
}
|
||||
})
|
||||
|
||||
pctx.HostJavaToolVariable("JarjarCmd", "jarjar.jar")
|
||||
pctx.HostJavaToolVariable("DesugarJar", "desugar.jar")
|
||||
pctx.HostJavaToolVariable("TurbineJar", "turbine.jar")
|
||||
|
||||
pctx.HostBinToolVariable("SoongJavacWrapper", "soong_javac_wrapper")
|
||||
|
||||
|
Reference in New Issue
Block a user