Use prebuilt turbine jar for unbundled javac builds. am: 9a36418089 am: b17b4758f9

am: ad858ea8c6

Change-Id: I95d44640ed39960b602a7eded8bba554817255d7

android/package_ctx.go

@@ -149,6 +149,15 @@ func (p AndroidPackageContext) HostJavaToolVariable(name, path string) blueprint
 	})
 }
 
+func (p AndroidPackageContext) HostJavaToolPath(config interface{}, path string) (Path, error) {
+	ctx := &configErrorWrapper{p, config.(Config), []error{}}
+	pa := PathForOutput(ctx, "host", ctx.config.PrebuiltOS(), "framework", path)
+	if len(ctx.errors) > 0 {
+		return nil, ctx.errors[0]
+	}
+	return pa, nil
+}
+
 // IntermediatesPathVariable returns a Variable whose value is the intermediate
 // directory appended with the supplied path. It may only be called during a Go
 // package's initialization - either from the init() function or as part of a

java/config/config.go

@@ -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")