diff options
| author | 2016-08-29 16:14:13 -0700 | |
|---|---|---|
| committer | 2016-08-31 09:48:08 -0700 | |
| commit | 9d45bb78c52d160d5bf73f2a485401d394f559b9 (patch) | |
| tree | 67bf21333066406fd7edc618a20d32cac0b1908d /java/builder.go | |
| parent | 3cfaba1654e12fed152844d94a92a8d8aec668f0 (diff) | |
Enable goma in soong
When the UseGoma flag is set, put all rules except the C compilation
rule in an externally defined local_pool, which will have been created
by kati. The gomacc wrapper will already be in the CC_WRAPPER
environment variable.
Bug: 31142427
Change-Id: I699d4edff2e302eee398dad8692ceb14721a628c
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/builder.go b/java/builder.go index f674f9808..a9da0fc08 100644 --- a/java/builder.go +++ b/java/builder.go @@ -37,7 +37,7 @@ var ( // this, all java rules write into separate directories and then a post-processing step lists // the files in the the directory into a list file that later rules depend on (and sometimes // read from directly using @<listfile>) - javac = pctx.StaticRule("javac", + javac = pctx.AndroidStaticRule("javac", blueprint.RuleParams{ Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + `$javacCmd -encoding UTF-8 $javacFlags $bootClasspath $classpath ` + @@ -49,7 +49,7 @@ var ( }, "javacCmd", "javacFlags", "bootClasspath", "classpath", "outDir") - jar = pctx.StaticRule("jar", + jar = pctx.AndroidStaticRule("jar", blueprint.RuleParams{ Command: `$jarCmd -o $out $jarArgs`, CommandDeps: []string{"$jarCmd"}, @@ -57,7 +57,7 @@ var ( }, "jarCmd", "jarArgs") - dx = pctx.StaticRule("dx", + dx = pctx.AndroidStaticRule("dx", blueprint.RuleParams{ Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + `$dxCmd --dex --output=$outDir $dxFlags $in || ( rm -rf "$outDir"; exit 41 ) && ` + @@ -67,7 +67,7 @@ var ( }, "outDir", "dxFlags") - jarjar = pctx.StaticRule("jarjar", + jarjar = pctx.AndroidStaticRule("jarjar", blueprint.RuleParams{ Command: "java -jar $jarjarCmd process $rulesFile $in $out", CommandDeps: []string{"$jarjarCmd", "$rulesFile"}, @@ -75,7 +75,7 @@ var ( }, "rulesFile") - extractPrebuilt = pctx.StaticRule("extractPrebuilt", + extractPrebuilt = pctx.AndroidStaticRule("extractPrebuilt", blueprint.RuleParams{ Command: `rm -rf $outDir && unzip -qo $in -d $outDir && ` + `find $outDir -name "*.class" > $classFile && ` + |