android/experiments/DocumentLoader/build.xml | 114 ++++++++++++++++++
android/experiments/DocumentLoader/project.properties | 11 +
sal/android/android_native_app_glue.c | 2
sal/inc/sal/main.h | 6
sal/osl/android/jni/Android.mk | 23 ---
sal/osl/android/jni/Application.mk | 2
6 files changed, 129 insertions(+), 29 deletions(-)
New commits:
commit 5e3059834e30276e520b8e0f701351d51af5c604
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed Dec 21 00:43:02 2011 +0200
Need visibility markup for ANativeActivity_onCreate() too
diff --git a/sal/android/android_native_app_glue.c
b/sal/android/android_native_app_glue.c
index 8ff9f69..440f3db 100644
--- a/sal/android/android_native_app_glue.c
+++ b/sal/android/android_native_app_glue.c
@@ -414,7 +414,7 @@ static void onInputQueueDestroyed(ANativeActivity*
activity, AInputQueue* queue)
android_app_set_input((struct android_app*)activity->instance, NULL);
}
-void ANativeActivity_onCreate(ANativeActivity* activity,
+__attribute__ ((visibility("default"))) void
ANativeActivity_onCreate(ANativeActivity* activity,
void* savedState, size_t savedStateSize) {
LOGI("Creating: %p\n", activity);
activity->callbacks->onDestroy = onDestroy;
commit 73b54eb92ea8add31efdfb40b86c2ea2b3f78942
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed Dec 21 00:03:34 2011 +0200
Need visibility markup for lo_main() too
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h
index f44a200..49c8b5d 100644
--- a/sal/inc/sal/main.h
+++ b/sal/inc/sal/main.h
@@ -120,11 +120,11 @@ static int sal_main(void);
#elif defined ANDROID
#ifdef __cplusplus
-extern "C" void lo_main(int argc, char **argv);
+extern "C" __attribute__ ((visibility("default"))) void lo_main(int argc, char
**argv);
#endif
#define SAL_MAIN_WITH_ARGS_IMPL \
-void lo_main(int argc, char **argv) \
+__attribute__ ((visibility("default"))) void lo_main(int argc, char **argv) \
{ \
sal_detail_initialize(argc, argv); \
sal_main_with_args(argc, argv); \
@@ -132,7 +132,7 @@ void lo_main(int argc, char **argv) \
}
#define SAL_MAIN_IMPL \
-void lo_main(int argc, char **argv) \
+__attribute__ ((visibility("default"))) void lo_main(int argc, char **argv) \
{ \
sal_detail_initialize(argc, argv); \
sal_main(); \
commit eae42329c2733f55969a9342edcfd320d3f6c156
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue Dec 20 18:13:24 2011 +0200
Add a couple of missing files
diff --git a/android/experiments/DocumentLoader/build.xml
b/android/experiments/DocumentLoader/build.xml
new file mode 100644
index 0000000..5d96019
--- /dev/null
+++ b/android/experiments/DocumentLoader/build.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="LibreOfficeDocumentLoader" default="help">
+
+ <!-- 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. -->
+ <loadproperties srcFile="local.properties" />
+
+ <!-- The ant.properties file can be created by you. It is only edited by
the
+ 'android' tool to add properties to it.
+ This is the place to change some Ant specific build properties.
+ Here are some properties you may want to change/update:
+
+ source.dir
+ The name of the source directory. Default is 'src'.
+ out.dir
+ The name of the output directory. Default is 'bin'.
+
+ For other overridable properties, look at the beginning of the rules
+ files in the SDK, at tools/ant/build.xml
+
+ Properties related to the SDK location or the project target should
+ be updated using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems.
+
+ -->
+ <property file="ant.properties" />
+
+ <!-- The project.properties file is created and updated by the 'android'
+ tool, as well as ADT.
+
+ This contains project specific properties such as project target, and
library
+ dependencies. Lower level build properties are stored in
ant.properties
+ (or in .classpath for Eclipse projects).
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems. -->
+ <loadproperties srcFile="project.properties" />
+
+ <!-- quick check on sdk.dir -->
+ <fail
+ message="sdk.dir is missing. Make sure to generate
local.properties using 'android update project'"
+ unless="sdk.dir"
+ />
+
+
+<!-- extension targets. Uncomment the ones where you want to do custom work
+ in between standard targets -->
+<!--
+ <target name="-pre-build">
+ </target>
+ <target name="-pre-compile">
+ </target>
+
+ /* This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir} */
+ <target name="-post-compile">
+ </target>
+-->
+
+ <!-- Import the actual build file.
+
+ To customize existing targets, there are two options:
+ - Customize only one target:
+ - copy/paste the target into this file, *before* the
+ <import> task.
+ - customize it to your needs.
+ - Customize the whole content of build.xml
+ - copy/paste the content of the rules files (minus the top node)
+ into this file, replacing the <import> task.
+ - customize to your needs.
+
+ ***********************
+ ****** IMPORTANT ******
+ ***********************
+ In all cases you must update the value of version-tag below to read
'custom' instead of an integer,
+ in order to avoid having your file be overridden by tools such as
"android update project"
+ -->
+ <!-- version-tag: 1 -->
+ <import file="${sdk.dir}/tools/ant/build.xml" />
+
+ <!-- Re-define the "-package-resources" target to not compress resources
-->
+
+ <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="AndroidManifest.xml"
+ assets="${asset.absolute.dir}"
+ androidjar="${android.jar}"
+ apkfolder="${out.absolute.dir}"
+ nocrunch="${build.packaging.nocrunch}"
+ resourcefilename="${resource.package.file.name}"
+ resourcefilter="${aapt.resource.filter}"
+ projectLibrariesResName="project.libraries.res"
+ projectLibrariesPackageName="project.libraries.package"
+ previousBuildType="${build.last.target}"
+ buildType="${build.target}">
+ <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>
diff --git a/android/experiments/DocumentLoader/project.properties
b/android/experiments/DocumentLoader/project.properties
new file mode 100644
index 0000000..730e911
--- /dev/null
+++ b/android/experiments/DocumentLoader/project.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-14
commit 527cca44ba161b59583334f1cfa89549bc94078b
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue Dec 20 18:10:50 2011 +0200
Bin leftover unused files
diff --git a/sal/osl/android/jni/Android.mk b/sal/osl/android/jni/Android.mk
deleted file mode 100644
index dbb014a..0000000
--- a/sal/osl/android/jni/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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 := lo-bootstrap
-LOCAL_SRC_FILES := lo-bootstrap.c
-LOCAL_LDLIBS := -llog -landroid
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/sal/osl/android/jni/Application.mk
b/sal/osl/android/jni/Application.mk
deleted file mode 100644
index a89e12d..0000000
--- a/sal/osl/android/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_ABI := armeabi-v7a
-APP_PLATFORM := android-9
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
