From 965a62a3c409f953ab0e7781546bb8ce65e1bd4a Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Wed, 13 Jul 2011 15:22:12 +0400
Subject: [PATCH] IDEA-72053 place gdbserver into apk in debug model

---
 .../android/compiler/AndroidPackagingCompiler.java |  2 +-
 .../android/compiler/tools/AndroidApkBuilder.java  | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
index 96f432445695..affe2432a007 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
@@ -411,7 +411,7 @@ public class AndroidPackagingCompiler implements PackagingCompiler {
       ArrayList<VirtualFile> nativeLibs = new ArrayList<VirtualFile>();
       for (VirtualFile nativeLibFolder : nativeLibFolders) {
         for (VirtualFile child : nativeLibFolder.getChildren()) {
-          AndroidApkBuilder.collectNativeLibraries(child, nativeLibs);
+          AndroidApkBuilder.collectNativeLibraries(child, nativeLibs, !releaseBuild);
         }
       }
       for (VirtualFile nativeLib : nativeLibs) {
diff --git a/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java b/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java
index 1c011cff99ff..815da70522a7 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java
@@ -236,7 +236,7 @@ public class AndroidApkBuilder {
       }
       for (VirtualFile nativeLibsFolder : nativeLibsFolders) {
         for (VirtualFile child : nativeLibsFolder.getChildren()) {
-          writeNativeLibraries(builder, nativeLibsFolder, child);
+          writeNativeLibraries(builder, nativeLibsFolder, child, signed);
         }
       }
       builder.close();
@@ -297,9 +297,10 @@ public class AndroidApkBuilder {
     });
   }
 
-  private static void writeNativeLibraries(SignedJarBuilder builder, VirtualFile nativeLibsFolder, VirtualFile child) throws IOException {
+  private static void writeNativeLibraries(SignedJarBuilder builder, VirtualFile nativeLibsFolder, VirtualFile child, boolean debugBuild)
+    throws IOException {
     ArrayList<VirtualFile> list = new ArrayList<VirtualFile>();
-    collectNativeLibraries(child, list);
+    collectNativeLibraries(child, list, debugBuild);
     for (VirtualFile file : list) {
       String relativePath = VfsUtil.getRelativePath(file, nativeLibsFolder, File.separatorChar);
       String path = FileUtil.toSystemIndependentName(SdkConstants.FD_APK_NATIVE_LIBS + File.separator + relativePath);
@@ -314,16 +315,17 @@ public class AndroidApkBuilder {
     return result;
   }
 
-  public static void collectNativeLibraries(@NotNull VirtualFile file, @NotNull List<VirtualFile> result) {
+  public static void collectNativeLibraries(@NotNull VirtualFile file, @NotNull List<VirtualFile> result, boolean debugBuild) {
     if (!file.isDirectory()) {
       String ext = file.getExtension();
-      if (AndroidUtils.EXT_NATIVE_LIB.equalsIgnoreCase(ext)) {
+      if (AndroidUtils.EXT_NATIVE_LIB.equalsIgnoreCase(ext) ||
+          (debugBuild && SdkConstants.FN_GDBSERVER.equals(file.getName()))) {
         result.add(file);
       }
     }
     else if (JavaResourceFilter.checkFolderForPackaging(file.getName())) {
       for (VirtualFile child : file.getChildren()) {
-        collectNativeLibraries(child, result);
+        collectNativeLibraries(child, result, debugBuild);
       }
     }
   }