Index: build/config/android/rules.gni |
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni |
index c21dfad09dd556fdbbbf7faf0b296098efa09ba7..2f1776a2e8fc94fe22d231ce0afa7a928dca9601 100644 |
--- a/build/config/android/rules.gni |
+++ b/build/config/android/rules.gni |
@@ -1809,6 +1809,14 @@ if (enable_java_templates) { |
} |
_dex_sources = [ _proguard_output_jar_path ] |
_dex_deps = [ ":$_proguard_target" ] |
+ if (defined(invoker.apk_under_test)) { |
+ _apk_under_test_dex_path = |
+ get_label_info(invoker.apk_under_test, "target_gen_dir") + "/" + |
+ get_label_info(invoker.apk_under_test, "name") + "/" + |
+ get_label_info(invoker.apk_under_test, "name") + ".dex.jar" |
+ _dex_sources += [ _apk_under_test_dex_path ] |
+ _dex_deps += [ "${invoker.apk_under_test}__java" ] |
+ } |
} else { |
if (enable_multidex) { |
_dex_sources = [ _jar_path ] |