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

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

Browse Source 
Fixes two issues:
1. Remove redundant check for hard-float in Teapot/MoreTeapots and ndk_helper
   they depend.  The ndk-build system add those flags already for armeabi-v7a-hard
2. native-audio in debug build: assert on the non-existance var

Change-Id: Id6b2d38a264c2f2d0e0c7fe625991fcee1762800
This commit is contained in:
Andrew Hsieh
2014-05-12 11:57:33 +08:00
parent 4645251978
commit 7986b0872e
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)