| Index: build/config/android/internal_rules.gni
|
| diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
|
| index 3f592bde50d8defe23865700d345bd55cf176142..15033df7ccb75b90dcd41581ef422e25d4acf874 100644
|
| --- a/build/config/android/internal_rules.gni
|
| +++ b/build/config/android/internal_rules.gni
|
| @@ -928,6 +928,11 @@ if (enable_java_templates) {
|
| if (_enable_multidex) {
|
| _main_dex_list_path = invoker.output + ".main_dex_list"
|
| _main_dex_list_target_name = "${target_name}__main_dex_list"
|
| + _gen_main_dex_java_list = false
|
| + if (defined(invoker.list_output)) {
|
| + _gen_main_dex_java_list = true
|
| + _main_dex_list_path_java = invoker.list_output
|
| + }
|
| action(_main_dex_list_target_name) {
|
| forward_variables_from(invoker,
|
| [
|
| @@ -980,6 +985,13 @@ if (enable_java_templates) {
|
| rebase_path(invoker.extra_main_dex_proguard_config, root_build_dir),
|
| ]
|
| }
|
| + if (_gen_main_dex_java_list) {
|
| + outputs += [ _main_dex_list_path_java ]
|
| + args += [
|
| + "--main-dex-list-path-java",
|
| + rebase_path(_main_dex_list_path_java, root_build_dir),
|
| + ]
|
| + }
|
|
|
| if (defined(invoker.args)) {
|
| args += invoker.args
|
|
|