tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

java: add missing tool dependencies

Browse source 
Add missing dependencies on the jar, aapt, signapk, and zipalign
tools.

Change-Id: Ib70fdd41daf84c474f72e1219bf3d02931fcefd7
This commit is contained in:
Colin Cross 2015-04-28 14:09:10 -07:00
parent 5adac8a045
commit eb1e6cc62c
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
java/app_builder.go
View file

@ -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": "",
},

2
java/builder.go
View file

@ -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},