From b84186462774fd54a8807ff4e67a99a859cb3d43 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Wed, 3 Oct 2012 19:37:11 +0400 Subject: [PATCH] android-jps: fix dependency order --- .../src/org/jetbrains/jps/android/AndroidJpsUtil.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java index 40a6eba1e42c..a58439655916 100644 --- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java +++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidJpsUtil.java @@ -489,8 +489,13 @@ public class AndroidJpsUtil { @NotNull List result, @NotNull Set visitedSet, boolean librariesOnly) { - for (JpsDependencyElement item : JpsJavaExtensionService.getInstance().getDependencies(module, JpsJavaClasspathKind.PRODUCTION_RUNTIME, - false)) { + final List dependencies = + new ArrayList(JpsJavaExtensionService.getInstance().getDependencies( + module, JpsJavaClasspathKind.PRODUCTION_RUNTIME, false)); + + for (int i = dependencies.size() - 1; i >= 0; i--) { + final JpsDependencyElement item = dependencies.get(i); + if (item instanceof JpsModuleDependency) { final JpsModule depModule = ((JpsModuleDependency)item).getModule(); if (depModule != null) {