android: Support for Android SDK Tools 23 + note about their brokeness.

Change-Id: I6b1636703044f03c5daa4c3ac1630f23c5c3c2e5

2 files changed, 56 insertions, 0 deletions

diff --git a/README.cross b/README.cross
index 1a773da88078..23fdc7ca5609 100644
--- a/README.cross
+++ b/README.cross
@@ -377,6 +377,17 @@ an "adb logcat" running in another window.
 To debug, do manually what "make run" would do and when the app has
 started, run ndk-gdb.
 
+NB: If you happen to upgrade to Android SDK Tools 23, and the build (using
+'make verbose=t android') fails for you with:
+
+       [dx] UNEXPECTED TOP-LEVEL EXCEPTION:
+       [dx] java.io.FileNotFoundException: /local/libreoffice/android-sdk-linux/tools/support/annotations.jar (Adresář nebo soubor neexistuje)
+
+you need to copy the annotations.jar from an older sdk; like
+
+wget 'http://dl-ssl.google.com/android/repository/tools_r22.6.2-linux.zip'
+unzip tools_r22.6.2-linux.zip
+cp tools/support/annotations.jar <android-sdk-linux>/tools/support/
 
 Raspbian
 ********
diff --git a/android/Bootstrap/no-resource-compress-23.xml b/android/Bootstrap/no-resource-compress-23.xml
new file mode 100644
index 000000000000..2b297826f0c8
--- /dev/null
+++ b/android/Bootstrap/no-resource-compress-23.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="clobber_android_rules" default="debug">
+
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+<!--
+    This is copy/pasted from ${sdk.dir}/tools/ant/build.xml
+    and tweaked - it needs to match the same SDK version as
+    your build
+-->
+
+<!--
+    This file is auto-generated by Bootstrap/Makefile.shared from
+    a versioned .xml file - please edit me there
+-->
+
+    <target name="-package-resources" depends="-crunch">
+        <!-- only package resources if *not* a library project -->
+        <do-only-if-not-library elseText="Library project: do not package resources..." >
+            <aapt executable="${aapt}"
+                    command="package"
+                    versioncode="${version.code}"
+                    versionname="${version.name}"
+                    debug="${build.is.packaging.debug}"
+                    manifest="${out.manifest.abs.file}"
+                    assets="${asset.absolute.dir}"
+                    androidjar="${project.target.android.jar}"
+                    apkfolder="${out.absolute.dir}"
+                    nocrunch="${build.packaging.nocrunch}"
+                    resourcefilename="${resource.package.file.name}"
+                    resourcefilter="${aapt.resource.filter}"
+                    libraryResFolderPathRefid="project.library.res.folder.path"
+                    libraryPackagesRefid="project.library.packages"
+                    libraryRFileRefid="project.library.bin.r.file.path"
+                    previousBuildType="${build.last.target}"
+                    buildType="${build.target}"
+                    ignoreAssets="${aapt.ignore.assets}">
+                <res path="${out.res.absolute.dir}" />
+                <res path="${resource.absolute.dir}" />
+                <nocompress/> <!-- forces no compression on any files in assets or res/raw -->
+                <!-- <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw -->
+            </aapt>
+        </do-only-if-not-library>
+    </target>
+</project>