Android support

Author: Maratyszcza

.gitignore

@@ -6,6 +6,8 @@ deps/
 build/
 bin/
 lib/
+libs/
+obj/
 *.pyc
 *.pyo
 

jni/Android.mk

@@ -0,0 +1,55 @@
+LOCAL_PATH := $(call my-dir)/..
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := cpuinfo
+LOCAL_SRC_FILES := $(LOCAL_PATH)/src/init.c \
+    $(LOCAL_PATH)/src/cache.c \
+    $(LOCAL_PATH)/src/log.c \
+    $(LOCAL_PATH)/src/linux/cpuset.c
+ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),armeabi armeabi-v7a))
+LOCAL_SRC_FILES += \
+	$(LOCAL_PATH)/src/arm/uarch.c \
+	$(LOCAL_PATH)/src/arm/cache.c \
+	$(LOCAL_PATH)/src/arm/linux/init.c \
+	$(LOCAL_PATH)/src/arm/linux/cpuinfo.c
+ifeq ($(TARGET_ARCH_ABI),armeabi)
+LOCAL_SRC_FILES += $(LOCAL_PATH)/src/arm/linux/isa.c.arm
+else
+LOCAL_SRC_FILES += $(LOCAL_PATH)/src/arm/linux/isa.c
+endif # armeabi
+endif # armeabi or armeabi-v7a
+ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),x86 x86_64))
+LOCAL_SRC_FILES += \
+    $(LOCAL_PATH)/src/x86/init.c \
+    $(LOCAL_PATH)/src/x86/info.c \
+    $(LOCAL_PATH)/src/x86/isa.c \
+    $(LOCAL_PATH)/src/x86/vendor.c \
+    $(LOCAL_PATH)/src/x86/uarch.c \
+    $(LOCAL_PATH)/src/x86/topology.c \
+    $(LOCAL_PATH)/src/x86/cache/init.c \
+    $(LOCAL_PATH)/src/x86/cache/descriptor.c \
+    $(LOCAL_PATH)/src/x86/cache/deterministic.c \
+    $(LOCAL_PATH)/src/x86/linux/init.c
+endif # x86 or x86_64
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_EXPORT_C_INCLUDES) $(LOCAL_PATH)/src
+LOCAL_CFLAGS := -std=gnu99 -D_GNU_SOURCE=1
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := cpu-info
+LOCAL_SRC_FILES := $(LOCAL_PATH)/tools/cpu-info.c
+LOCAL_STATIC_LIBRARIES := cpuinfo
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := isa-info
+LOCAL_SRC_FILES := $(LOCAL_PATH)/tools/isa-info.c
+LOCAL_STATIC_LIBRARIES := cpuinfo
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := cache-info
+LOCAL_SRC_FILES := $(LOCAL_PATH)/tools/cache-info.c
+LOCAL_STATIC_LIBRARIES := cpuinfo
+include $(BUILD_EXECUTABLE)

jni/Application.mk

@@ -0,0 +1,4 @@
+APP_PLATFORM := android-21
+APP_PIE := true
+APP_STL := c++_static
+APP_ABI := armeabi armeabi-v7a x86 x86_64

src/log.c

@@ -9,9 +9,16 @@
 		va_list args;
 		va_start(args, format);
 
-		dprintf(STDERR_FILENO, "Error: ");
-		vdprintf(STDERR_FILENO, format, args);
-		dprintf(STDERR_FILENO, "\n");
+		#ifdef __ANDROID__
+			fprintf(stderr, "Error: ");
+			vfprintf(stderr, format, args);
+			fprintf(stderr, "\n");
+			fflush(stderr);
+		#else
+			dprintf(STDERR_FILENO, "Error: ");
+			vdprintf(STDERR_FILENO, format, args);
+			dprintf(STDERR_FILENO, "\n");
+		#endif
 
 		va_end(args);
 	}
@@ -22,9 +29,16 @@
 		va_list args;
 		va_start(args, format);
 
-		dprintf(STDERR_FILENO, "Warning: ");
-		vdprintf(STDERR_FILENO, format, args);
-		dprintf(STDERR_FILENO, "\n");
+		#ifdef __ANDROID__
+			fprintf(stderr, "Warning: ");
+			vfprintf(stderr, format, args);
+			fprintf(stderr, "\n");
+			fflush(stderr);
+		#else
+			dprintf(STDERR_FILENO, "Warning: ");
+			vdprintf(STDERR_FILENO, format, args);
+			dprintf(STDERR_FILENO, "\n");
+		#endif
 
 		va_end(args);
 	}
@@ -35,8 +49,14 @@
 		va_list args;
 		va_start(args, format);
 
-		vdprintf(STDOUT_FILENO, format, args);
-		dprintf(STDOUT_FILENO, "\n");
+		#ifdef __ANDROID__
+			vprintf(format, args);
+			printf("\n");
+			fflush(stdout);
+		#else
+			vdprintf(STDOUT_FILENO, format, args);
+			dprintf(STDOUT_FILENO, "\n");
+		#endif
 
 		va_end(args);
 	}
@@ -47,8 +67,14 @@
 		va_list args;
 		va_start(args, format);
 
-		vdprintf(STDOUT_FILENO, format, args);
-		dprintf(STDOUT_FILENO, "\n");
+		#ifdef __ANDROID__
+			vprintf(format, args);
+			printf("\n");
+			fflush(stdout);
+		#else
+			vdprintf(STDOUT_FILENO, format, args);
+			dprintf(STDOUT_FILENO, "\n");
+		#endif
 
 		va_end(args);
 	}