ref: d04ff1df5f8e0069ebc287cb07419e2476439e36
parent: 8d31783c17c002c9e3db219957c65ab96dde1d5c
parent: 3a4cea63ef9a368ff2ef1c7a609ee03b11b5bfb7
author: Ethan Hugg <[email protected]>
date: Tue Apr 8 04:51:17 EDT 2014
Merge pull request #579 from ylatuya/cpufeatures Rename cpufeatures symbols to avoid colisions in static builds
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -59,5 +59,10 @@
COMMON_INCLUDES += -I$(NDKROOT)/sources/android/cpufeatures
COMMON_OBJS += $(COMMON_SRCDIR)/cpu-features.$(OBJ)
+COMMON_CFLAGS += \
+ -Dandroid_getCpuIdArm=wels_getCpuIdArm -Dandroid_setCpuArm=wels_setCpuArm \
+ -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
$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c $(CXX_O) $<