From 9b85be009f5d943adcfd9b9d21c6585497e8d722 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sat, 27 Jul 2013 11:00:34 +0100
Subject: [PATCH] slim down NDK-in-place so buildserver can build squeezebox
 apps

---
 metadata/org.billthefarmer.accordion.txt | 7 +++++--
 metadata/org.billthefarmer.melodeon.txt  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/metadata/org.billthefarmer.accordion.txt b/metadata/org.billthefarmer.accordion.txt
index 42cd85016f..157c341447 100644
--- a/metadata/org.billthefarmer.accordion.txt
+++ b/metadata/org.billthefarmer.accordion.txt
@@ -21,10 +21,13 @@ Uses undocumented built in Sonivox midi synthesizer for midi audio output.
 Repo Type:git
 Repo:https://github.com/billthefarmer/accordion
 
-Build Version:1.01,101,!no disk space on server at v1.01,\
+Build Version:1.01,101,v1.01,\
 extlibs=arch-arm/libsonivox.so,\
 scanignore=build/org.billthefarmer.accordion,\
-build=mkdir -p ndk-r8e/ && cp -r $$NDK$$/* ndk-r8e/ && \
+build=mkdir -p ndk-r8e/toolchains && \
+      find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 |\
+        xargs -0 cp -r -t ndk-r8e/ && \
+      cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r8e/toolchains/ && \
       mv libs/libsonivox.so ndk-r8e/platforms/android-14/arch-arm/usr/lib/ && \
       ./ndk-r8e/ndk-build && rm -rf ndk-r8e/,\
 buildjni=no
diff --git a/metadata/org.billthefarmer.melodeon.txt b/metadata/org.billthefarmer.melodeon.txt
index 4c22bd9b98..4b421bb059 100644
--- a/metadata/org.billthefarmer.melodeon.txt
+++ b/metadata/org.billthefarmer.melodeon.txt
@@ -21,10 +21,13 @@ Uses undocumented built in Sonivox midi synthesizer for midi audio output.
 Repo Type:git
 Repo:https://github.com/billthefarmer/melodeon
 
-Build Version:1.0,1,!build server runs out of disk space v1.0,\
+Build Version:1.0,1,v1.0,\
 extlibs=arch-arm/libsonivox.so,\
 scanignore=build/org.billthefarmer.melodeon,\
-build=mkdir -p ndk-r8e/ && cp -r $$NDK$$/* ndk-r8e/ && \
+build=mkdir -p ndk-r8e/toolchains/ && \
+      find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 |\
+        xargs -0 cp -r -t ndk-r8e/ && \
+      cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r8e/toolchains/ && \
       mv libs/libsonivox.so ndk-r8e/platforms/android-14/arch-arm/usr/lib/ && \
       ./ndk-r8e/ndk-build && rm -rf ndk-r8e/,\
 buildjni=no