diff options
| author | Colin Cross <ccross@android.com> | 2015-04-28 14:09:10 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-04-28 15:34:45 -0700 |
| commit | eb1e6cc62ce2d4d6228e8a1d7f6dd7381b798129 (patch) | |
| tree | b2aee0b6f73db2f53afb454b5eac71dca6bf99a3 /java | |
| parent | 5adac8a0451690bd843e7a047ffc9f851995a1e3 (diff) | |
| download | build_soong-eb1e6cc62ce2d4d6228e8a1d7f6dd7381b798129.tar.gz build_soong-eb1e6cc62ce2d4d6228e8a1d7f6dd7381b798129.tar.bz2 build_soong-eb1e6cc62ce2d4d6228e8a1d7f6dd7381b798129.zip | |
java: add missing tool dependencies
Add missing dependencies on the jar, aapt, signapk, and zipalign
tools.
Change-Id: Ib70fdd41daf84c474f72e1219bf3d02931fcefd7
Diffstat (limited to 'java')
| -rw-r--r-- | java/app_builder.go | 25 | ||||
| -rw-r--r-- | java/builder.go | 2 |
2 files changed, 18 insertions, 9 deletions
diff --git a/java/app_builder.go b/java/app_builder.go index 96577bcc..8e907d22 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -96,6 +96,8 @@ func CreateResourceJavaFiles(ctx common.AndroidModuleContext, flags []string, publicResourcesFile := filepath.Join(common.ModuleOutDir(ctx), "public_resources.xml") proguardOptionsFile := filepath.Join(common.ModuleOutDir(ctx), "proguard.options") + deps = append([]string{"$aaptCmd"}, deps...) + ctx.Build(pctx, blueprint.BuildParams{ Rule: aaptCreateResourceJavaFile, Outputs: []string{publicResourcesFile, proguardOptionsFile, javaFileList}, @@ -115,6 +117,8 @@ func CreateResourceJavaFiles(ctx common.AndroidModuleContext, flags []string, func CreateExportPackage(ctx common.AndroidModuleContext, flags []string, deps []string) string { outputFile := filepath.Join(common.ModuleOutDir(ctx), "package-export.apk") + deps = append([]string{"$aaptCmd"}, deps...) + ctx.Build(pctx, blueprint.BuildParams{ Rule: aaptCreateAssetsPackage, Outputs: []string{outputFile}, @@ -133,9 +137,10 @@ func CreateAppPackage(ctx common.AndroidModuleContext, flags []string, jarFile s resourceApk := filepath.Join(common.ModuleOutDir(ctx), "resources.apk") ctx.Build(pctx, blueprint.BuildParams{ - Rule: aaptAddResources, - Outputs: []string{resourceApk}, - Inputs: []string{jarFile}, + Rule: aaptAddResources, + Outputs: []string{resourceApk}, + Inputs: []string{jarFile}, + Implicits: []string{"$aaptCmd"}, Args: map[string]string{ "aaptFlags": strings.Join(flags, " "), }, @@ -149,9 +154,10 @@ func CreateAppPackage(ctx common.AndroidModuleContext, flags []string, jarFile s } ctx.Build(pctx, blueprint.BuildParams{ - Rule: signapk, - Outputs: []string{signedApk}, - Inputs: []string{resourceApk}, + Rule: signapk, + Outputs: []string{signedApk}, + Inputs: []string{resourceApk}, + Implicits: []string{"$signapkCmd"}, Args: map[string]string{ "certificates": strings.Join(certificateArgs, " "), }, @@ -160,9 +166,10 @@ func CreateAppPackage(ctx common.AndroidModuleContext, flags []string, jarFile s outputFile := filepath.Join(common.ModuleOutDir(ctx), "package.apk") ctx.Build(pctx, blueprint.BuildParams{ - Rule: zipalign, - Outputs: []string{outputFile}, - Inputs: []string{signedApk}, + Rule: zipalign, + Outputs: []string{outputFile}, + Inputs: []string{signedApk}, + Implicits: []string{"$zipalignCmd"}, Args: map[string]string{ "zipalignFlags": "", }, diff --git a/java/builder.go b/java/builder.go index 6a0ae619..d4b900d3 100644 --- a/java/builder.go +++ b/java/builder.go @@ -204,6 +204,8 @@ func TransformDexToJavaLib(ctx common.AndroidModuleContext, resources []jarSpec, deps = append(deps, dexJarSpec.fileList) jarArgs = append(jarArgs, dexJarSpec.soongJarArgs()) + deps = append(deps, "$jarCmd") + ctx.Build(pctx, blueprint.BuildParams{ Rule: jar, Outputs: []string{outputFile}, |