diff --git a/utils/platform_lib_abstractions/loc_pla/include/platform_lib_android_runtime.h b/utils/platform_lib_abstractions/loc_pla/include/platform_lib_android_runtime.h deleted file mode 100644 index 9a954f08..00000000 --- a/utils/platform_lib_abstractions/loc_pla/include/platform_lib_android_runtime.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2014, The Linux Foundation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of The Linux Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __PLATFORM_LIB_ANDROID_RUNTIME_H__ -#define __PLATFORM_LIB_ANDROID_RUNTIME_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -pthread_t platform_lib_abstraction_createJavaThread(const char* name, void (*start)(void *), void* arg); -#define LOC_EXT_CREATE_THREAD_CB_PLATFORM_LIB_ABSTRACTION platform_lib_abstraction_createJavaThread - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /*__PLATFORM_LIB_ANDROID_RUNTIME_H__ */ diff --git a/utils/platform_lib_abstractions/loc_pla/include/platform_lib_includes.h b/utils/platform_lib_abstractions/loc_pla/include/platform_lib_includes.h index 47c37df8..ebb71197 100644 --- a/utils/platform_lib_abstractions/loc_pla/include/platform_lib_includes.h +++ b/utils/platform_lib_abstractions/loc_pla/include/platform_lib_includes.h @@ -29,7 +29,6 @@ #ifndef __PLATFORM_LIB_INCLUDES_H__ #define __PLATFORM_LIB_INCLUDES_H__ -#include "platform_lib_android_runtime.h" #include "platform_lib_gettid.h" #include "platform_lib_log_util.h" #include "platform_lib_macros.h" diff --git a/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/utils/platform_lib_abstractions/loc_pla/src/Android.mk index 0bcddcba..7d321efa 100644 --- a/utils/platform_lib_abstractions/loc_pla/src/Android.mk +++ b/utils/platform_lib_abstractions/loc_pla/src/Android.mk @@ -11,11 +11,9 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ liblog \ - libloc_stub \ - libandroid_runtime + libloc_stub LOCAL_SRC_FILES += \ - platform_lib_android_runtime.cpp \ platform_lib_gettid.cpp \ platform_lib_log_util.cpp \ platform_lib_property_service.cpp \ @@ -35,7 +33,6 @@ LOCAL_C_INCLUDES:= \ LOCAL_COPY_HEADERS_TO:= libloc_pla/ LOCAL_COPY_HEADERS:= \ - ../include/platform_lib_android_runtime.h \ ../include/platform_lib_gettid.h \ ../include/platform_lib_includes.h \ ../include/platform_lib_log_util.h \ diff --git a/utils/platform_lib_abstractions/loc_pla/src/platform_lib_android_runtime.cpp b/utils/platform_lib_abstractions/loc_pla/src/platform_lib_android_runtime.cpp deleted file mode 100644 index 090af13b..00000000 --- a/utils/platform_lib_abstractions/loc_pla/src/platform_lib_android_runtime.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (c) 2014, The Linux Foundation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * * Neither the name of The Linux Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "platform_lib_android_runtime.h" - -#ifdef USE_GLIB -#include -#else -#include -#endif /* USE_GLIB */ - -pthread_t platform_lib_abstraction_createJavaThread(const char* name, void (*start)(void *), void* arg) -{ - return (pthread_t)android::AndroidRuntime::createJavaThread(name, start, arg); -}