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

Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"

Browse Source
This commit is contained in:
Andrew Hsieh
2014-05-15 11:01:00 +00:00
committed by Gerrit Code Review
parent 94ebf1e6a9 7986b0872e
commit a5afedd2e2
4 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ndk/platforms/android-17/samples/Teapot/jni/Android.mk
View File

@@ -13,14 +13,6 @@ LOCAL_CFLAGS :=
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2
LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue ndk_helper
ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
LOCAL_LDLIBS += -lm_hard
ifeq (,$(filter -fuse-ld=mcld,$(APP_LDFLAGS) $(LOCAL_LDFLAGS)))
LOCAL_LDFLAGS += -Wl,--no-warn-mismatch
endif
endif
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/ndk_helper)

10
ndk/platforms/android-18/samples/MoreTeapots/jni/Android.mk
View File

@@ -6,20 +6,12 @@ LOCAL_MODULE := MoreTeapotsNativeActivity
LOCAL_SRC_FILES := MoreTeapotsNativeActivity.cpp \
MoreTeapotsRenderer.cpp \
LOCAL_C_INCLUDES :=
LOCAL_C_INCLUDES :=
LOCAL_CFLAGS :=
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2
LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue ndk_helper
ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
LOCAL_LDLIBS += -lm_hard
ifeq (,$(filter -fuse-ld=mcld,$(APP_LDFLAGS) $(LOCAL_LDFLAGS)))
LOCAL_LDFLAGS += -Wl,--no-warn-mismatch
endif
endif
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/ndk_helper)

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

@@ -133,7 +133,7 @@ void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
// this callback handler is called every time a buffer finishes recording
void bqRecorderCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
{
assert(bq == bqRecorderBufferQueue);
assert(bq == recorderBufferQueue);
assert(NULL == context);
// for streaming recording, here we would call Enqueue to give recorder the next buffer to fill
// but instead, this is a one-time buffer so we stop recording

10
ndk/sources/android/ndk_helper/Android.mk
View File

@@ -10,16 +10,6 @@ LOCAL_EXPORT_LDLIBS := -llog -landroid -lEGL -lGLESv2
LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue
ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
LOCAL_EXPORT_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
LOCAL_EXPORT_LDLIBS += -lm_hard
ifeq (,$(filter -fuse-ld=mcld,$(APP_LDFLAGS) $(LOCAL_LDFLAGS)))
LOCAL_EXPORT_LDFLAGS += -Wl,--no-warn-mismatch
endif
endif
include $(BUILD_STATIC_LIBRARY)
#$(call import-module,android/native_app_glue)