diff options
| author | Colin Cross <ccross@android.com> | 2016-08-29 16:14:13 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-08-31 09:48:08 -0700 |
| commit | 9d45bb78c52d160d5bf73f2a485401d394f559b9 (patch) | |
| tree | 67bf21333066406fd7edc618a20d32cac0b1908d /java/app_builder.go | |
| parent | 3cfaba1654e12fed152844d94a92a8d8aec668f0 (diff) | |
| download | android_build_soong-9d45bb78c52d160d5bf73f2a485401d394f559b9.tar.gz android_build_soong-9d45bb78c52d160d5bf73f2a485401d394f559b9.tar.bz2 android_build_soong-9d45bb78c52d160d5bf73f2a485401d394f559b9.zip | |
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/app_builder.go')
| -rw-r--r-- | java/app_builder.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index d8f2571c..bbd3dac4 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -27,7 +27,7 @@ import ( ) var ( - aaptCreateResourceJavaFile = pctx.StaticRule("aaptCreateResourceJavaFile", + aaptCreateResourceJavaFile = pctx.AndroidStaticRule("aaptCreateResourceJavaFile", blueprint.RuleParams{ Command: `rm -rf "$javaDir" && mkdir -p "$javaDir" && ` + `$aaptCmd package -m $aaptFlags -P $publicResourcesFile -G $proguardOptionsFile ` + @@ -38,7 +38,7 @@ var ( }, "aaptFlags", "publicResourcesFile", "proguardOptionsFile", "javaDir", "javaFileList") - aaptCreateAssetsPackage = pctx.StaticRule("aaptCreateAssetsPackage", + aaptCreateAssetsPackage = pctx.AndroidStaticRule("aaptCreateAssetsPackage", blueprint.RuleParams{ Command: `rm -f $out && $aaptCmd package $aaptFlags -F $out`, CommandDeps: []string{"$aaptCmd"}, @@ -46,7 +46,7 @@ var ( }, "aaptFlags", "publicResourcesFile", "proguardOptionsFile", "javaDir", "javaFileList") - aaptAddResources = pctx.StaticRule("aaptAddResources", + aaptAddResources = pctx.AndroidStaticRule("aaptAddResources", blueprint.RuleParams{ // TODO: add-jni-shared-libs-to-package Command: `cp -f $in $out.tmp && $aaptCmd package -u $aaptFlags -F $out.tmp && mv $out.tmp $out`, @@ -55,7 +55,7 @@ var ( }, "aaptFlags") - signapk = pctx.StaticRule("signapk", + signapk = pctx.AndroidStaticRule("signapk", blueprint.RuleParams{ Command: `java -jar $signapkCmd $certificates $in $out`, CommandDeps: []string{"$signapkCmd"}, @@ -63,7 +63,7 @@ var ( }, "certificates") - androidManifestMerger = pctx.StaticRule("androidManifestMerger", + androidManifestMerger = pctx.AndroidStaticRule("androidManifestMerger", blueprint.RuleParams{ Command: "java -classpath $androidManifestMergerCmd com.android.manifmerger.Main merge " + "--main $in --libs $libsManifests --out $out", |