ref: 56edea9bcd5e70bf88fb9b0f43f6905d88d832eb
parent: 0ef26d6a3ff5b89af0f59a56c6e8955292d99722
parent: 10eeea52fe15f58005833d9b27e486053b7ea04e
author: zhilwang <zhilwang@cisco.com>
date: Thu Jul 3 09:47:14 EDT 2014
Merge pull request #1066 from mstorsjo/android-cpufeatures-dir Build the android cpu-features.o file in codec/common/src
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -67,7 +67,7 @@
-cd ./codec/build/android/enc && $(NDKROOT)/ndk-build APP_ABI=$(APP_ABI) clean && ant clean
COMMON_INCLUDES += -I$(NDKROOT)/sources/android/cpufeatures
-COMMON_OBJS += $(COMMON_SRCDIR)/cpu-features.$(OBJ)
+COMMON_OBJS += $(COMMON_SRCDIR)/src/cpu-features.$(OBJ)
COMMON_CFLAGS += \
-Dandroid_getCpuIdArm=wels_getCpuIdArm -Dandroid_setCpuArm=wels_setCpuArm \
@@ -74,5 +74,5 @@
-Dandroid_getCpuCount=wels_getCpuCount -Dandroid_getCpuFamily=wels_getCpuFamily \
-Dandroid_getCpuFeatures=wels_getCpuFeatures -Dandroid_setCpu=wels_setCpu \
-codec/common/cpu-features.$(OBJ): $(NDKROOT)/sources/android/cpufeatures/cpu-features.c
+codec/common/src/cpu-features.$(OBJ): $(NDKROOT)/sources/android/cpufeatures/cpu-features.c
$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c $(CXX_O) $<