diff options
| author | 2019-03-19 16:03:11 -0700 | |
|---|---|---|
| committer | 2019-03-19 23:33:47 +0000 | |
| commit | e560c4aabc9ef65ad10f6d795f56f2a1fbd8b3db (patch) | |
| tree | 495f88e3db5e8aa9511a451a11bc2ec6f6c83353 /java/aapt2.go | |
| parent | 1b7a4b00742fe7bcd22ae04e1b9eae2c01b3677c (diff) | |
Support package_splits
Pass the package_splits list from the property to aapt2 as
--split arguments, sign the extra outputs, install them, and
add them as extra output files for SourceFileProducer.
Bug: 127921149
Test: TestAppSplits
Change-Id: Id94a53ae6a8a68ec81e98abba2fefc9c23feaa7a
Diffstat (limited to 'java/aapt2.go')
| -rw-r--r-- | java/aapt2.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/aapt2.go b/java/aapt2.go index d217b9f59..bcc8e9765 100644 --- a/java/aapt2.go +++ b/java/aapt2.go @@ -161,7 +161,7 @@ var fileListToFileRule = pctx.AndroidStaticRule("fileListToFile", func aapt2Link(ctx android.ModuleContext, packageRes, genJar, proguardOptions, rTxt, extraPackages android.WritablePath, flags []string, deps android.Paths, - compiledRes, compiledOverlay android.Paths) { + compiledRes, compiledOverlay android.Paths, splitPackages android.WritablePaths) { genDir := android.PathForModuleGen(ctx, "aapt2", "R") @@ -196,12 +196,14 @@ func aapt2Link(ctx android.ModuleContext, inFlags = append(inFlags, "-R", "@"+overlayFileList.String()) } + implicitOutputs := append(splitPackages, proguardOptions, genJar, rTxt, extraPackages) + ctx.Build(pctx, android.BuildParams{ Rule: aapt2LinkRule, Description: "aapt2 link", Implicits: deps, Output: packageRes, - ImplicitOutputs: android.WritablePaths{proguardOptions, genJar, rTxt, extraPackages}, + ImplicitOutputs: implicitOutputs, Args: map[string]string{ "flags": strings.Join(flags, " "), "inFlags": strings.Join(inFlags, " "), |