diff options
| author | agrieve <agrieve@chromium.org> | 2015-12-23 07:21:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-23 15:22:58 +0000 |
| commit | e37dbc81379a6018ee85e260daa95da750fabfa1 (patch) | |
| tree | b75f90cf9a03ea3fa62ab7d6420f337105e5b2bb /build/config | |
| parent | 30423b8a37806d41e1b5cbe1397dc0a6817b62a5 (diff) | |
| download | chromium_src-e37dbc81379a6018ee85e260daa95da750fabfa1.zip chromium_src-e37dbc81379a6018ee85e260daa95da750fabfa1.tar.gz chromium_src-e37dbc81379a6018ee85e260daa95da750fabfa1.tar.bz2 | |
GN: Remove asset_location parameter in favour of android_assets()
BUG=547162
Review URL: https://codereview.chromium.org/1533363002
Cr-Commit-Position: refs/heads/master@{#366747}
Diffstat (limited to 'build/config')
| -rw-r--r-- | build/config/android/internal_rules.gni | 13 | ||||
| -rw-r--r-- | build/config/android/rules.gni | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 3416243..2c9e0c5 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -853,13 +853,6 @@ template("create_apk") { invoker.native_libs_even_when_incremental } - # TODO(agrieve): Remove support for asset_location in favor of using - # android_assets() everywhere (http://crbug.com/547162). - if (defined(invoker.asset_location)) { - _asset_location = invoker.asset_location - assert(_asset_location != "") # Mark as used. - } - _version_code = invoker.version_code _version_name = invoker.version_name assert(_version_code != -1) # Mark as used. @@ -931,12 +924,6 @@ template("create_apk") { rebase_path(invoker.resource_packaged_apk_path, root_build_dir), ] - if (defined(_asset_location)) { - args += [ - "--asset-dir", - rebase_path(_asset_location, root_build_dir), - ] - } if (defined(_resources_zip)) { args += [ "--resource-zips", diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index aeb7f1e..c9388af 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -1669,7 +1669,6 @@ template("android_apk") { deps = [] forward_variables_from(invoker, [ - "asset_location", "deps", "extensions_to_not_compress", "language_splits", |