Build fixes

fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java

@@ -21,7 +21,7 @@
 
 import java.util.*;
 
-import org.fbreader.util.NaturalOrderComparator;
+import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
 import org.fbreader.util.Pair;
 
 import org.geometerplus.zlibrary.core.filesystem.ZLFile;

fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java

@@ -26,7 +26,7 @@
 import android.annotation.TargetApi;
 import android.os.Build;
 
-import org.fbreader.util.NaturalOrderComparator;
+import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
 
 public abstract class TitledEntity<T extends TitledEntity<T>> implements Comparable<T> {
 	private static final NaturalOrderComparator ourComparator = new NaturalOrderComparator();

third-party/AmbilWarna/build.xml

@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <property file="local.properties" />
+    <property file="../../local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.

third-party/AmbilWarna/project.properties

@@ -11,4 +11,4 @@ android.library=true
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-11
+target=android-19

third-party/SuperToasts/build.xml

@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <property file="local.properties" />
+    <property file="../../local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.

third-party/android-filechooser/code/build.xml

@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <property file="local.properties" />
+    <property file="../../../local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.

third-party/android-filechooser/code/project.properties

@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-19
 android.library=true

third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java

@@ -13,7 +13,7 @@
 
 import java.util.Comparator;
 
-import org.fbreader.util.NaturalOrderComparator;
+import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
 
 /**
  * {@link IFile} comparator.<br>

fbreader/app/src/main/java/org/fbreader/util/NaturalOrderComparator.java → third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/NaturalOrderComparator.java

@@ -1,4 +1,4 @@
-package org.fbreader.util;
+package group.pals.android.lib.ui.filechooser.utils;
 
 /*
  NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java.

third-party/drag-sort-listview/library/build.xml

@@ -4,7 +4,7 @@
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
          Version Control Systems. -->
-    <property file="local.properties" />
+    <property file="../../../local.properties" />
 
     <!-- The ant.properties file can be created by you. It is only edited by the
          'android' tool to add properties to it.
@@ -78,6 +78,17 @@
          in order to avoid having your file be overridden by tools such as "android update project"
     -->
     <!-- version-tag: 1 -->
+
+    <!-- because of this: https://code.google.com/p/android/issues/detail?id=33194, this target is needed to use jar.libs.dir -->
+    <target name="-pre-compile">
+        <echo>Custom pre-compile!</echo>
+        <path id="project.all.jars.path">
+            <fileset dir="${jar.libs.dir}">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+    </target>
+
     <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>

third-party/drag-sort-listview/library/project.properties

@@ -12,4 +12,5 @@
 
 android.library=true
 # Project target.
-target=android-5
+target=android-19
+jar.libs.dir=../../../libs