Merge commit '0372192addb3aa17ea3d2e6fa8b04f63452544cb' * commit '0372192addb3aa17ea3d2e6fa8b04f63452544cb': ndk sample hello-neon: use $(call import-module) to access the 'cpufeatures' library
This commit is contained in:
committed by
Android Git Automerger
commit
755261c445
@@ -11,12 +11,10 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
|
||||
LOCAL_SRC_FILES += helloneon-intrinsics.c.neon
|
||||
endif
|
||||
|
||||
LOCAL_C_INCLUDES := $(NDK_ROOT)/sources/cpufeatures
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := cpufeatures
|
||||
|
||||
LOCAL_LDLIBS := -llog
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
include $(NDK_ROOT)/sources/cpufeatures/Android.mk
|
||||
$(call import-module,cpufeatures)
|
||||
|
||||
Reference in New Issue
Block a user