Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71044fe7 authored by Colin Cross's avatar Colin Cross
Browse files

Move libandroid_runtime headers into frameworks/base/core/jni 

Move libandroid_runtime's headers into its source directory, and export
them to modules that link against libandroid_runtime.  Also fixes
one unused-paramter warning that was hidden by the use of -isystem to
include frameworks/base/include.

Bug: 33630870
Test: m -j native
Change-Id: Id6c2561d6c7d82a7ca2d183f11b1d3d3dcb42843
parent 19def994

core/jni/Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ LOCAL_SRC_FILES:= \ 
    hwbinder/EphemeralStorage.cpp \



LOCAL_C_INCLUDES += \

    $(LOCAL_PATH)/include \

    $(JNI_H_INCLUDE) \

    $(LOCAL_PATH)/android/graphics \

    $(LOCAL_PATH)/../../libs/hwui \
@@ -279,8 +280,10 @@ LOCAL_SHARED_LIBRARIES += \ 
# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp

LOCAL_C_INCLUDES += bionic/libc/private



LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include



# AndroidRuntime.h depends on nativehelper/jni.h

LOCAL_EXPORT_C_INCLUDE_DIRS := libnativehelper/include

LOCAL_EXPORT_C_INCLUDE_DIRS += libnativehelper/include



LOCAL_MODULE:= libandroid_runtime

include/android_runtime/AndroidRuntime.h→core/jni/include/android_runtime/AndroidRuntime.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public: 
     * Called when the Java application exits to perform additional cleanup actions

     * before the process is terminated.

     */

    virtual void onExit(int code) { }

    virtual void onExit(int /*code*/) { }



    /** create a new thread that is visible from Java */

    static android_thread_id_t createJavaThread(const char* name, void (*start)(void *),