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

Merge "Fix characteristic rro for overridden packages" into main

Browse source
This commit is contained in:
Inseob Kim 2024-02-16 01:41:48 +00:00 committed by Gerrit Code Review
commit f617e18741
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
java/app.go
View file

@ -1113,6 +1113,8 @@ func (a *AndroidApp) OutputFiles(tag string) (android.Paths, error) {
if a.rJar != nil {
return []android.Path{a.rJar}, nil
}
case ".apk":
return []android.Path{a.outputFile}, nil
case ".export-package.apk":
return []android.Path{a.exportPackage}, nil
case ".manifest.xml":
@ -1207,10 +1209,10 @@ func AndroidAppFactory() android.Module {
Cmd *string
}{
Name: proptools.StringPtr(rroManifestName),
Tools: []string{"characteristics_rro_generator"},
Tools: []string{"characteristics_rro_generator", "aapt2"},
Out: []string{"AndroidManifest.xml"},
Srcs: []string{":" + a.Name() + "{.manifest.xml}"},
Cmd: proptools.StringPtr("$(location characteristics_rro_generator) $(in) $(out)"),
Srcs: []string{":" + a.Name() + "{.apk}"},
Cmd: proptools.StringPtr("$(location characteristics_rro_generator) $$($(location aapt2) dump packagename $(in)) $(out)"),
}
ctx.CreateModule(genrule.GenRuleFactory, &rroManifestProperties)