[Libreoffice-commits] .: android/experimental android/qa

[Libreoffice Gerrit user]

 android/experimental/DocumentLoader/Makefile           |    3 +++
 android/experimental/DocumentLoader/jni/Application.mk |    3 ---
 android/qa/sc/Makefile                                 |    3 +++
 android/qa/sc/jni/Application.mk                       |    2 --
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 811751bbadbf2cc6f77fc1a7f311fec9edc7d937
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 23 12:33:37 2012 +0300

    Don't hardcode jni/Application.mk either
    
    Change-Id: Id8787a04a3b1720490e7d79a254ca11835df242a

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 804d915..adff84f 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -35,6 +35,9 @@ all: build-ant
 properties:
 	echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
 	echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties
+	echo "# File needed by ndk-gdb" >jni/Application.mk
+	echo "APP_ABI := $(ANDROID_APP_ABI)" >>jni/Application.mk
+	echo "APP_PLATFORM := android-14" >>jni/Application.mk
 
 copy-stuff:
 # First always clean
diff --git a/android/experimental/DocumentLoader/jni/Application.mk b/android/experimental/DocumentLoader/jni/Application.mk
deleted file mode 100644
index f326d1a..0000000
--- a/android/experimental/DocumentLoader/jni/Application.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# File needed by ndk-gdb
-APP_ABI := armeabi-v7a
-APP_PLATFORM := android-14
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 91f4c48..b77c5cf 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -26,6 +26,9 @@ all: build-ant
 properties:
 	echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
 	echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties 
+	echo "# File needed by ndk-gdb" >jni/Application.mk
+	echo "APP_ABI := $(ANDROID_APP_ABI)" >>jni/Application.mk
+	echo "APP_PLATFORM := android-14" >>jni/Application.mk
 
 copy-stuff:
 #
diff --git a/android/qa/sc/jni/Application.mk b/android/qa/sc/jni/Application.mk
deleted file mode 100644
index a11b28d..0000000
--- a/android/qa/sc/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_ABI := armeabi-v7a
-APP_PLATFORM := android-14