aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-09-05 22:26:22 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-09-05 22:26:22 +0000
commit77b79e49b2dd16ce20df396d491529b6e745419f (patch)
tree1df78dfe9b11089af17fa33d62efba61ab15c404
parentb0c85e30e4a2c16caacd9e52e5d2125fe0a1d094 (diff)
parentcc2839e60e9b548bc3e80b30c8a0940b247852dc (diff)
downloadsoong-android10-mainline-a-release.tar.gz
Merge cherrypicks of [9337661, 9337959] into qt-aml-releaseandroid-mainline-10.0.0_r2android10-mainline-a-release
Change-Id: I2a9aa0f1263459e5980295187593297a0c332ea7
-rw-r--r--apex/apex.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go
index 69a50f1c8..e5d431edf 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -86,7 +86,8 @@ var (
Command: `${zip2zip} -i $in -o $out ` +
`apex_payload.img:apex/${abi}.img ` +
`apex_manifest.json:root/apex_manifest.json ` +
- `AndroidManifest.xml:manifest/AndroidManifest.xml`,
+ `AndroidManifest.xml:manifest/AndroidManifest.xml ` +
+ `assets/NOTICE.html.gz:assets/NOTICE.html.gz`,
CommandDeps: []string{"${zip2zip}"},
Description: "app bundle",
}, "abi")