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

am ad77ed7d: ndk: fix samples compilation

Browse Source 
Merge commit 'ad77ed7d47e7e4037905ccc220bde65d24825f71' into gingerbread-plus-aosp

* commit 'ad77ed7d47e7e4037905ccc220bde65d24825f71':
  ndk: fix samples compilation
This commit is contained in:
David 'Digit' Turner
2010-07-17 09:07:42 -07:00
committed by Android Git Automerger
parent 110f6cd94a ad77ed7d47
commit 06565c9d35
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/samples/native-activity/jni/main.c
View File

@@ -136,7 +136,7 @@ static int engine_do_ui_event(struct engine* engine) {
if (AInputQueue_preDispatchEvent(engine->app->inputQueue, event)) { if (AInputQueue_preDispatchEvent(engine->app->inputQueue, event)) {
return 1; return 1;
} }
if (AInputEvent_getType(event) == INPUT_EVENT_TYPE_MOTION) { if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) {
engine->animating = 1; engine->animating = 1;
engine->x = AMotionEvent_getX(event, 0); engine->x = AMotionEvent_getX(event, 0);
engine->y = AMotionEvent_getY(event, 0); engine->y = AMotionEvent_getY(event, 0);

4
ndk/samples/native-plasma/jni/plasma.c
View File

@@ -417,10 +417,10 @@ static int engine_do_ui_event(struct engine* engine) {
if (AInputQueue_preDispatchEvent(engine->app->inputQueue, event)) { if (AInputQueue_preDispatchEvent(engine->app->inputQueue, event)) {
return 1; return 1;
} }
if (AInputEvent_getType(event) == INPUT_EVENT_TYPE_MOTION) { if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) {
engine->animating = 1; engine->animating = 1;
AInputQueue_finishEvent(engine->app->inputQueue, event, 1); AInputQueue_finishEvent(engine->app->inputQueue, event, 1);
} else if (AInputEvent_getType(event) == INPUT_EVENT_TYPE_KEY) { } else if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_KEY) {
LOGI("Key event: action=%d keyCode=%d metaState=0x%x", LOGI("Key event: action=%d keyCode=%d metaState=0x%x",
AKeyEvent_getAction(event), AKeyEvent_getAction(event),
AKeyEvent_getKeyCode(event), AKeyEvent_getKeyCode(event),

3
ndk/samples/test-libstdc++/jni/Android.mk
View File

@@ -6,7 +6,4 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := test-libstl LOCAL_MODULE := test-libstl
LOCAL_SRC_FILES := test-libstl.cpp LOCAL_SRC_FILES := test-libstl.cpp
LOCAL_STATIC_LIBRARIES := libstdc++
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
include $(NDK_ROOT)/sources/cpp-stl/minimal/Android.mk

5
ndk/samples/test-libstdc++/jni/test-libstl.cpp
View File

@@ -1,3 +1,8 @@
#include <cerrno> #include <cerrno>
#include <cstddef> #include <cstddef>
int main(void)
{
return 0;
}