diff options
| author | 2019-07-17 02:45:03 +0000 | |
|---|---|---|
| committer | 2019-07-17 02:45:03 +0000 | |
| commit | 223e6a65b6f72ddae0a299c0ef1b297d0d56bf81 (patch) | |
| tree | a053b7150a2bd47bf45b5e6c316dc6496c747626 /java/java.go | |
| parent | 2e16e2d9e19dc10d8d4f9671374dea49be38a288 (diff) | |
| parent | e5cae33f5dbb3882700662a745dc9d4bdf529f16 (diff) | |
Merge changes from topic "buildnumberfromfile"
* changes:
Allow jar wrapper to take quoted arguments
Add rspfile support to RuleBuilder
Prepare droiddoc for using RuleBuilder
Manually escape BuildNumberFromFile
Fix android.Expand and ninja escaping
Add RuleBuilder helper functions for built and prebuilt tools
Add documentation to droiddoc.go module types
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index f9ec27e24..a49aad775 100644 --- a/java/java.go +++ b/java/java.go @@ -2088,14 +2088,14 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { // use zip2zip to uncompress classes*.dex files rule.Command(). - Tool(ctx.Config().HostToolPath(ctx, "zip2zip")). + BuiltTool(ctx, "zip2zip"). FlagWithInput("-i ", inputJar). FlagWithOutput("-o ", temporary). FlagWithArg("-0 ", "'classes*.dex'") // use zipalign to align uncompressed classes*.dex files rule.Command(). - Tool(ctx.Config().HostToolPath(ctx, "zipalign")). + BuiltTool(ctx, "zipalign"). Flag("-f"). Text("4"). Input(temporary). |