Commit 56320dae authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Remove unused build option "write_asset_list=true"

Has been unused for multiple years.

TBR=agrieve  # Trivial build refactor

Change-Id: I45ffeb9038896e34221569b13fe81aeec5a02eb5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1914977
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarMohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715145}
parent f273eef6
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
"""Adds the code parts to a resource APK.""" """Adds the code parts to a resource APK."""
import argparse import argparse
import itertools
import os import os
import shutil import shutil
import sys import sys
...@@ -205,12 +204,6 @@ def _AddAssets(apk, path_tuples, disable_compression=False): ...@@ -205,12 +204,6 @@ def _AddAssets(apk, path_tuples, disable_compression=False):
compress=compress) compress=compress)
def _CreateAssetsList(path_tuples):
"""Returns a newline-separated list of asset paths for the given paths."""
dests = sorted(t[1] for t in path_tuples)
return '\n'.join(dests) + '\n'
def _AddNativeLibraries(out_apk, native_libs, android_abi, uncompress): def _AddNativeLibraries(out_apk, native_libs, android_abi, uncompress):
"""Add native libraries to APK.""" """Add native libraries to APK."""
has_crazy_linker = any( has_crazy_linker = any(
...@@ -312,10 +305,6 @@ def main(args): ...@@ -312,10 +305,6 @@ def main(args):
resource_apk.getinfo('AndroidManifest.xml'), out_dir=apk_manifest_dir) resource_apk.getinfo('AndroidManifest.xml'), out_dir=apk_manifest_dir)
# 2. Assets # 2. Assets
if options.write_asset_list:
data = _CreateAssetsList(itertools.chain(assets, uncompressed_assets))
build_utils.AddToZipHermetic(out_apk, 'assets/assets_list', data=data)
_AddAssets(out_apk, assets, disable_compression=False) _AddAssets(out_apk, assets, disable_compression=False)
_AddAssets(out_apk, uncompressed_assets, disable_compression=True) _AddAssets(out_apk, uncompressed_assets, disable_compression=True)
......
...@@ -2580,8 +2580,6 @@ if (enable_java_templates) { ...@@ -2580,8 +2580,6 @@ if (enable_java_templates) {
# secondary ABI. # secondary ABI.
# secondary_abi_native_libs_filearg: (optional). @FileArg() of additional # secondary_abi_native_libs_filearg: (optional). @FileArg() of additional
# secondary ABI native libs. # secondary ABI native libs.
# write_asset_list: Adds an extra file to the assets, which contains a list of
# all other asset files.
# keystore_path: Path to keystore to use for signing. # keystore_path: Path to keystore to use for signing.
# keystore_name: Key alias to use. # keystore_name: Key alias to use.
# keystore_password: Keystore password. # keystore_password: Keystore password.
...@@ -2663,9 +2661,6 @@ if (enable_java_templates) { ...@@ -2663,9 +2661,6 @@ if (enable_java_templates) {
# an APK build_config. # an APK build_config.
args += [ "--java-resources=@FileArg($_rebased_build_config:java_resources_jars)" ] args += [ "--java-resources=@FileArg($_rebased_build_config:java_resources_jars)" ]
} }
if (defined(invoker.write_asset_list) && invoker.write_asset_list) {
args += [ "--write-asset-list" ]
}
if (defined(invoker.dex_path)) { if (defined(invoker.dex_path)) {
_rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir) _rebased_dex_path = rebase_path(invoker.dex_path, root_build_dir)
args += [ "--dex-file=$_rebased_dex_path" ] args += [ "--dex-file=$_rebased_dex_path" ]
......
...@@ -2054,8 +2054,6 @@ if (enable_java_templates) { ...@@ -2054,8 +2054,6 @@ if (enable_java_templates) {
# (optional). # (optional).
# secondary_native_lib_placeholders: List of placeholder filenames to add to # secondary_native_lib_placeholders: List of placeholder filenames to add to
# the apk for the secondary ABI (optional). # the apk for the secondary ABI (optional).
# write_asset_list: Adds an extra file to the assets, which contains a list of
# all other asset files.
# generate_buildconfig_java: If defined and false, skip generating the # generate_buildconfig_java: If defined and false, skip generating the
# BuildConfig java class describing the build configuration. The default # BuildConfig java class describing the build configuration. The default
# is true for non-test APKs. # is true for non-test APKs.
...@@ -3175,7 +3173,6 @@ if (enable_java_templates) { ...@@ -3175,7 +3173,6 @@ if (enable_java_templates) {
[ [
"native_lib_placeholders", "native_lib_placeholders",
"secondary_native_lib_placeholders", "secondary_native_lib_placeholders",
"write_asset_list",
"uncompress_dex", "uncompress_dex",
"uncompress_shared_libraries", "uncompress_shared_libraries",
]) ])
...@@ -3468,7 +3465,6 @@ if (enable_java_templates) { ...@@ -3468,7 +3465,6 @@ if (enable_java_templates) {
"use_chromium_linker", "use_chromium_linker",
"version_code", "version_code",
"version_name", "version_name",
"write_asset_list",
]) ])
is_bundle_module = false is_bundle_module = false
name = invoker.apk_name name = invoker.apk_name
...@@ -3501,7 +3497,6 @@ if (enable_java_templates) { ...@@ -3501,7 +3497,6 @@ if (enable_java_templates) {
if (_is_base_module) { if (_is_base_module) {
assert(!defined(invoker.base_module_target)) assert(!defined(invoker.base_module_target))
} else { } else {
assert(!defined(invoker.write_asset_list))
assert(!defined(invoker.app_as_shared_lib)) assert(!defined(invoker.app_as_shared_lib))
assert(!defined(invoker.shared_resources)) assert(!defined(invoker.shared_resources))
assert(!defined(invoker.shared_resources_whitelist_target)) assert(!defined(invoker.shared_resources_whitelist_target))
...@@ -3591,7 +3586,6 @@ if (enable_java_templates) { ...@@ -3591,7 +3586,6 @@ if (enable_java_templates) {
"verify_manifest", "verify_manifest",
"version_code", "version_code",
"version_name", "version_name",
"write_asset_list",
]) ])
is_bundle_module = true is_bundle_module = true
generate_buildconfig_java = _is_base_module generate_buildconfig_java = _is_base_module
......
...@@ -102,7 +102,6 @@ template("test") { ...@@ -102,7 +102,6 @@ template("test") {
"target_sdk_version", "target_sdk_version",
"use_default_launcher", "use_default_launcher",
"use_native_activity", "use_native_activity",
"write_asset_list",
] ]
# Adds the unwind tables from unstripped binary as an asset file in the # Adds the unwind tables from unstripped binary as an asset file in the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment