LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 83bd985e: am 470ec2be: am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"

Browse Source 
* commit '83bd985ec66d25e4d11abc60f02f00c4ecc2c7c4':
  Fixed asset_manager.h, rect_manager.h, and jni.h
This commit is contained in:
Andrew Hsieh
2014-01-16 17:22:58 +00:00
committed by Android Git Automerger
parent 5c67ce0ba1 83bd985ec6
commit a2ef514b62
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/platforms/android-13/include/android/asset_manager.h
View File

@@ -18,6 +18,8 @@
#ifndef ANDROID_ASSET_MANAGER_H
#define ANDROID_ASSET_MANAGER_H
#include <sys/types.h>
#ifdef __cplusplus
extern "C" {
#endif

2
ndk/platforms/android-14/include/android/rect.h
View File

@@ -18,6 +18,8 @@
#ifndef ANDROID_RECT_H
#define ANDROID_RECT_H
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif

4
ndk/platforms/android-3/include/jni.h
View File

@@ -1144,8 +1144,8 @@ jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*);
* Prototypes for functions exported by loadable shared libs. These are
* called by JNI, not provided by JNI.
*/
JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved);
JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved);
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved);
JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* vm, void* reserved);
#ifdef __cplusplus
}