Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3872)

Unified Diff: build/config/android/internal_rules.gni

Issue 1533363002: GN: Remove asset_location parameter in favour of android_assets() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@asset-location-1
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 4673bf4567ba405962d4694c0024b5bd8580b76f..312bcf3a52c264e40e815be8a56ee8ad349e1426 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",
« no previous file with comments | « no previous file | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698