| Index: build/config/android/internal_rules.gni
|
| diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
|
| index 97c337df377988858199139acddc4e9c976384aa..ab773eae500ebbc3bf9d1a0968e0e0220837b841 100644
|
| --- a/build/config/android/internal_rules.gni
|
| +++ b/build/config/android/internal_rules.gni
|
| @@ -321,12 +321,6 @@
|
| args += [
|
| "--package-name",
|
| invoker.custom_package,
|
| - ]
|
| - }
|
| - if (defined(invoker.r_text)) {
|
| - args += [
|
| - "--r-text",
|
| - rebase_path(invoker.r_text, root_build_dir),
|
| ]
|
| }
|
| }
|
| @@ -1011,7 +1005,6 @@
|
|
|
| zip_path = invoker.zip_path
|
| srcjar_path = invoker.srcjar_path
|
| - r_text_path = invoker.r_text_path
|
| build_config = invoker.build_config
|
| resource_dirs = invoker.resource_dirs
|
| android_manifest = invoker.android_manifest
|
| @@ -1029,7 +1022,6 @@
|
| depfile,
|
| zip_path,
|
| srcjar_path,
|
| - r_text_path,
|
| ]
|
|
|
| sources_build_rel = exec_script("//build/android/gyp/find.py",
|
| @@ -1058,11 +1050,8 @@
|
| rebase_path(srcjar_path, root_build_dir),
|
| "--resource-zip-out",
|
| rebase_path(zip_path, root_build_dir),
|
| - "--r-text-out",
|
| - rebase_path(r_text_path, root_build_dir),
|
| "--dependencies-res-zips=@FileArg($rebase_build_config:resources:dependency_zips)",
|
| "--extra-res-packages=@FileArg($rebase_build_config:resources:extra_package_names)",
|
| - "--extra-r-text-files=@FileArg($rebase_build_config:resources:extra_r_text_files)",
|
| ]
|
|
|
| if (non_constant_id) {
|
|
|