From 2f97a883c4d60723600a54d6a9d70b8a4e7852db Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Fri, 12 Oct 2012 15:03:13 +0400
Subject: [PATCH] fix order in asset packaging (app assets should override lib
 ones)

---
 .../src/org/jetbrains/android/compiler/tools/AndroidApt.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApt.java b/plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApt.java
index 37fba94dbb60..1e2287dd4ae1 100644
--- a/plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApt.java
+++ b/plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApt.java
@@ -306,7 +306,8 @@ public final class AndroidApt {
           }
           else {
             tempDir = FileUtil.createTempDirectory("android_combined_assets", "tmp");
-            for (String assetDir : nonEmptyAssetDirs) {
+            for (int i = nonEmptyAssetDirs.length - 1; i >= 0; i--) {
+              final String assetDir = nonEmptyAssetDirs[i];
               FileUtil.copyDir(new File(assetDir), tempDir, assetsFilter);
             }
             args.add("-A");