diff options
| -rw-r--r-- | sal/Package_inc.mk | 1 | ||||
| -rw-r--r-- | sal/inc/sal/ByteBufferWrapper.hxx | 51 | ||||
| -rw-r--r-- | touch/Library_libotouch.mk | 8 | ||||
| -rw-r--r-- | touch/source/android/android.cxx | 36 |
4 files changed, 96 insertions, 0 deletions
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk index 1bce8ecd4aba..00dc323a2b4e 100644 --- a/sal/Package_inc.mk +++ b/sal/Package_inc.mk @@ -106,6 +106,7 @@ $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustring.h,rtl/ustring.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ustring.hxx,rtl/ustring.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/uuid.h,rtl/uuid.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/alloca.h,sal/alloca.h)) +$(eval $(call gb_Package_add_file,sal_inc,inc/sal/ByteBufferWrapper.hxx,sal/ByteBufferWrapper.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/config.h,sal/config.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/log-areas.dox,sal/log-areas.dox)) $(eval $(call gb_Package_add_file,sal_inc,inc/sal/log.hxx,sal/log.hxx)) diff --git a/sal/inc/sal/ByteBufferWrapper.hxx b/sal/inc/sal/ByteBufferWrapper.hxx new file mode 100644 index 000000000000..954922d65b16 --- /dev/null +++ b/sal/inc/sal/ByteBufferWrapper.hxx @@ -0,0 +1,51 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright 2012 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef _SAL_BYTEBUFFERWRAPPER_HXX +#define _SAL_BYTEBUFFERWRAPPER_HXX + +#ifdef ANDROID + +#include <jni.h> + +#include <sal/types.h> + +namespace org { namespace libreoffice { namespace touch { + +class ByteBufferWrapper +{ +private: + JNIEnv *env; + jobject object; + +public: + ByteBufferWrapper(JNIEnv *e, jobject o) : + env(e) + { + object = env->NewGlobalRef(o); + } + + sal_uInt8* pointer() + { + return (sal_uInt8 *) env->GetDirectBufferAddress(object); + } + + void operator()(sal_uInt8 * /* p */) + { + env->DeleteGlobalRef(object); + } +}; + +}; }; }; + +#endif + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/touch/Library_libotouch.mk b/touch/Library_libotouch.mk index be355e3868ad..418c31a989de 100644 --- a/touch/Library_libotouch.mk +++ b/touch/Library_libotouch.mk @@ -28,6 +28,14 @@ $(eval $(call gb_Library_add_exception_objects,libotouch,\ touch/source/generic/libotouch \ )) +ifeq ($(OS),ANDROID) + +$(eval $(call gb_Library_add_exception_objects,libotouch,\ + touch/source/android/android \ +)) + +endif + ifeq ($(OS),IOS) $(eval $(call gb_Library_add_objcxx_objects,libotouch,\ diff --git a/touch/source/android/android.cxx b/touch/source/android/android.cxx new file mode 100644 index 000000000000..06768c86c646 --- /dev/null +++ b/touch/source/android/android.cxx @@ -0,0 +1,36 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright 2012 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <jni.h> + +#include <sal/ByteBufferWrapper.hxx> + +using org::libreoffice::touch::ByteBufferWrapper; + +extern "C" +__attribute__ ((visibility("default"))) +jlong +Java_org_libreoffice_android_Bootstrap_new_1byte_1buffer_1wrapper(JNIEnv *env, + jobject /* clazz */, + jobject bytebuffer) +{ + return (jlong) (intptr_t) new ByteBufferWrapper(env, bytebuffer); +} + +extern "C" +__attribute__ ((visibility("default"))) +void +Java_org_libreoffice_android_Bootstrap_delete_1byte_1buffer_1wrapper(JNIEnv * /* env */, + jobject /* clazz */, + jlong bbw) +{ + delete (ByteBufferWrapper*) (intptr_t) bbw; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |