summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaewoong Jung <jungjw@google.com>2019-06-18 13:10:28 -0700
committerJaewoong Jung <jungjw@google.com>2019-06-25 14:04:32 -0700
commit036d5058939248d76c93f43d9515dff3afbcbf87 (patch)
tree7b09c69894596ac788e5fb0e9e85edf562082c19
parent8a8a356efa93acf20f88dffae7da211aba276513 (diff)
downloadapex-036d5058939248d76c93f43d9515dff3afbcbf87.tar.gz
Add an optional flag for an assets/ dir.android10-dev
This allows supplemental resource files (e.g. NOTICE output) to be included in the APEX under assets. Bug: 135218846 Test: Built Mainline modules + manual inspection Change-Id: Iafdbc9012ea72a2298b84e70779282c00f191f31 Merged-In: Iafdbc9012ea72a2298b84e70779282c00f191f31 (cherry picked from commit 2247d1d56781e832f79afe82637e725226a272d3)
-rw-r--r--apexer/apexer.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py
index e09e0535..e57e2691 100644
--- a/apexer/apexer.py
+++ b/apexer/apexer.py
@@ -48,6 +48,8 @@ def ParseArgs(argv):
help='path to the APEX manifest file')
parser.add_argument('--android_manifest',
help='path to the AndroidManifest file. If omitted, a default one is created and used')
+ parser.add_argument('--assets_dir',
+ help='an assets directory to be included in the APEX')
parser.add_argument('--file_contexts',
help='selinux file contexts file. Required for "image" APEXs.')
parser.add_argument('--canned_fs_config',
@@ -360,6 +362,8 @@ def CreateApex(args, work_dir):
cmd.extend(['--version-name', manifest_apex.versionName])
if args.target_sdk_version:
cmd.extend(['--target-sdk-version', args.target_sdk_version])
+ if args.assets_dir:
+ cmd.extend(['-A', args.assets_dir])
# Default value for minSdkVersion.
cmd.extend(['--min-sdk-version', '29'])
cmd.extend(['-o', apk_file])