0

Add <bundle target>_apk to each bundle creating APKS archive from bundle

This target will be used in future CLs to generate APKS archives for
bundle smoke tests.

Bug: 989654
Change-Id: I1ba0063d7c9ce93ec60a4403ce3ca158c36b3451
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1768919
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690080}
This commit is contained in:
Tibor Goldschwendt
2019-08-23 21:19:09 +00:00
committed by Commit Bot
parent b80cd96463
commit 84ec04c7bd
4 changed files with 39 additions and 6 deletions

@@ -1194,7 +1194,7 @@ _ANDROID_SPECIFIC_PYDEPS_FILES = [
'build/android/gyp/assert_static_initializers.pydeps', 'build/android/gyp/assert_static_initializers.pydeps',
'build/android/gyp/bytecode_processor.pydeps', 'build/android/gyp/bytecode_processor.pydeps',
'build/android/gyp/compile_resources.pydeps', 'build/android/gyp/compile_resources.pydeps',
'build/android/gyp/create_app_bundle_minimal_apks.pydeps', 'build/android/gyp/create_app_bundle_apks.pydeps',
'build/android/gyp/create_bundle_wrapper_script.pydeps', 'build/android/gyp/create_bundle_wrapper_script.pydeps',
'build/android/gyp/copy_ex.pydeps', 'build/android/gyp/copy_ex.pydeps',
'build/android/gyp/create_app_bundle.pydeps', 'build/android/gyp/create_app_bundle.pydeps',

@@ -4,7 +4,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
"""Creates an .apks from an .aab with only English strings.""" """Creates an .apks from an .aab."""
import argparse import argparse
import os import os
@@ -28,6 +28,10 @@ def main():
'--keystore-password', required=True, help='Keystore password.') '--keystore-password', required=True, help='Keystore password.')
parser.add_argument( parser.add_argument(
'--keystore-name', required=True, help='Key name within keystore') '--keystore-name', required=True, help='Key name within keystore')
parser.add_argument(
'--minimal',
action='store_true',
help='Create APKs archive with minimal language support.')
args = parser.parse_args() args = parser.parse_args()
@@ -38,7 +42,7 @@ def main():
args.keystore_path, args.keystore_path,
args.keystore_password, args.keystore_password,
args.keystore_name, args.keystore_name,
minimal=True, minimal=args.minimal,
check_for_noop=False) check_for_noop=False)

@@ -1,5 +1,5 @@
# Generated by running: # Generated by running:
# build/print_python_deps.py --root build/android/gyp --output build/android/gyp/create_app_bundle_minimal_apks.pydeps build/android/gyp/create_app_bundle_minimal_apks.py # build/print_python_deps.py --root build/android/gyp --output build/android/gyp/create_app_bundle_apks.pydeps build/android/gyp/create_app_bundle_apks.py
../../../third_party/jinja2/__init__.py ../../../third_party/jinja2/__init__.py
../../../third_party/jinja2/_compat.py ../../../third_party/jinja2/_compat.py
../../../third_party/jinja2/bccache.py ../../../third_party/jinja2/bccache.py
@@ -26,7 +26,7 @@
../pylib/utils/__init__.py ../pylib/utils/__init__.py
../pylib/utils/app_bundle_utils.py ../pylib/utils/app_bundle_utils.py
bundletool.py bundletool.py
create_app_bundle_minimal_apks.py create_app_bundle_apks.py
util/__init__.py util/__init__.py
util/build_utils.py util/build_utils.py
util/md5_check.py util/md5_check.py

@@ -4888,6 +4888,34 @@ if (enable_java_templates) {
public_deps += [ ":$_size_info_target" ] public_deps += [ ":$_size_info_target" ]
} }
} }
_apks_path = "$root_build_dir/apks/$_bundle_name.apks"
action_with_pydeps("${target_name}_apks") {
script = "//build/android/gyp/create_app_bundle_apks.py"
inputs = [
_bundle_path,
]
outputs = [
_apks_path,
]
args = [
"--bundle",
_rebased_bundle_path,
"--output",
rebase_path(_apks_path, root_build_dir),
"--aapt2-path",
rebase_path(android_sdk_tools_bundle_aapt2, root_build_dir),
"--keystore-path",
rebase_path(android_keystore_path, root_build_dir),
"--keystore-name",
android_keystore_name,
"--keystore-password",
android_keystore_password,
]
deps = [
":$_bundle_target_name",
]
}
} }
# Create an .apks file from an .aab file. The .apks file will contain the # Create an .apks file from an .aab file. The .apks file will contain the
@@ -4911,7 +4939,7 @@ if (enable_java_templates) {
"deps", "deps",
"testonly", "testonly",
]) ])
script = "//build/android/gyp/create_app_bundle_minimal_apks.py" script = "//build/android/gyp/create_app_bundle_apks.py"
_dir = get_path_info(invoker.bundle_path, "dir") _dir = get_path_info(invoker.bundle_path, "dir")
_name = get_path_info(invoker.bundle_path, "name") _name = get_path_info(invoker.bundle_path, "name")
_output_path = "$_dir/$_name.minimal.apks" _output_path = "$_dir/$_name.minimal.apks"
@@ -4934,6 +4962,7 @@ if (enable_java_templates) {
android_keystore_name, android_keystore_name,
"--keystore-password", "--keystore-password",
android_keystore_password, android_keystore_password,
"--minimal",
] ]
} }
} }