ref: 3a4cea63ef9a368ff2ef1c7a609ee03b11b5bfb7
parent: f305096f0156f48d90dfa6ca49855a4576f19d3c
author: Andoni Morales Alastruey <ylatuya@gmail.com>
date: Tue Mar 25 13:16:28 EDT 2014
Rename cpufeatures symbols to avoid colisions in static builds This fixes potential duplicated symbols in static links with other libraries including the cpufeatures.o object file
--- 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) $<