[Libreoffice-commits] .: 2 commits - android/qa unotest/source

[Tor Lillqvist]

 android/qa/sc/jni/Android.mk                |   23 +++++++++++++++++++++++
 android/qa/sc/jni/Application.mk            |    2 ++
 unotest/source/cpp/bootstrapfixturebase.cxx |    4 ++--
 3 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 47c6f602f7874f3bbc48f970a29f3780e8927963
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Jan 23 12:03:52 2012 +0200

    Use /assets as SRC_ROOT and OUTDIR_FOR_BUILD on Android

diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index 907535e..d135992 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -58,8 +58,8 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
         m_aSolverRootURL += rtl::OUString::createFromAscii( "/" );
 #endif
 #else
-    const char* pSrcRoot = "/";
-    const char* pSolverRoot = "/";
+    const char* pSrcRoot = "/assets";
+    const char* pSolverRoot = "/assets";
 #endif
     m_aSrcRootPath = rtl::OUString::createFromAscii( pSrcRoot );
     m_aSrcRootURL += m_aSrcRootPath;
commit 77d80f9e5bf2c34bacc9bbdf1cfc3bafe593dd51
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Jan 23 11:57:59 2012 +0200

    Possibly need dummy jni/Android.mk and Application.mk for ndk-gdb to work

diff --git a/android/qa/sc/jni/Android.mk b/android/qa/sc/jni/Android.mk
new file mode 100644
index 0000000..c5c2ed3
--- /dev/null
+++ b/android/qa/sc/jni/Android.mk
@@ -0,0 +1,23 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := dummy
+LOCAL_SRC_FILES := dummy.c
+LOCAL_LDLIBS    := 
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/android/qa/sc/jni/Application.mk b/android/qa/sc/jni/Application.mk
new file mode 100644
index 0000000..a11b28d
--- /dev/null
+++ b/android/qa/sc/jni/Application.mk
@@ -0,0 +1,2 @@
+APP_ABI := armeabi-v7a
+APP_PLATFORM := android-14