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

am 0f30dd0d: Merge "Fix warning compiling samples with clang3.1"

Browse Source 
* commit '0f30dd0d198b9806239c366ae327f6b83bcdd396':
  Fix warning compiling samples with clang3.1
This commit is contained in:
Andrew Hsieh
2012-12-06 10:59:15 -08:00
committed by Android Git Automerger
parent 83c6e0c285 0f30dd0d19
commit 7d5a4faace
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ndk/platforms/android-9/samples/native-audio/jni/native-audio-jni.c
View File

@@ -259,7 +259,7 @@ jboolean Java_com_example_nativeaudio_NativeAudio_createUriAudioPlayer(JNIEnv* e
SLresult result;
// convert Java string to UTF-8
const jbyte *utf8 = (*env)->GetStringUTFChars(env, uri, NULL);
const char *utf8 = (*env)->GetStringUTFChars(env, uri, NULL);
assert(NULL != utf8);
// configure audio source
@@ -545,13 +545,13 @@ jboolean Java_com_example_nativeaudio_NativeAudio_createAssetAudioPlayer(JNIEnv*
SLresult result;
// convert Java string to UTF-8
const jbyte *utf8 = (*env)->GetStringUTFChars(env, filename, NULL);
const char *utf8 = (*env)->GetStringUTFChars(env, filename, NULL);
assert(NULL != utf8);
// use asset manager to open asset by filename
AAssetManager* mgr = AAssetManager_fromJava(env, assetManager);
assert(NULL != mgr);
AAsset* asset = AAssetManager_open(mgr, (const char *) utf8, AASSET_MODE_UNKNOWN);
AAsset* asset = AAssetManager_open(mgr, utf8, AASSET_MODE_UNKNOWN);
// release the Java string and UTF-8
(*env)->ReleaseStringUTFChars(env, filename, utf8);

2
ndk/platforms/android-9/samples/native-plasma/jni/plasma.c
View File

@@ -407,7 +407,7 @@ static void engine_draw_frame(struct engine* engine) {
stats_endFrame(&engine->stats);
}
static int engine_term_display(struct engine* engine) {
static void engine_term_display(struct engine* engine) {
engine->animating = 0;
}

1
ndk/samples/module-exports/jni/bar/bar.c
View File

@@ -1,4 +1,5 @@
#include "bar.h"
#include "foo.h"
int bar(int x)
{