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

Commit 54184590 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move libandroid_runtime headers into frameworks/base/core/jni"

parents c0cc7c64 71044fe7
Loading
Loading
Loading
Loading
+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

+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 *),
Loading