summaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-12-19 15:42:04 +0000
committerThomas Martitz <kugel@rockbox.org>2011-12-19 15:42:04 +0000
commit287454de2e076eafcd393dec6cf0e2674ca25586 (patch)
treeab66ced6589ae8188dbcd110fc5572797b12155f /android
parentf53c04b766f470eb58c919b7d38f8bfec654c797 (diff)
downloadrockbox-287454de2e076eafcd393dec6cf0e2674ca25586.tar.gz
rockbox-287454de2e076eafcd393dec6cf0e2674ca25586.tar.bz2
rockbox-287454de2e076eafcd393dec6cf0e2674ca25586.zip
Hosted/linux: Add process/cpu info screen to the debug menu.
The new menu is very helpful on RaaA, but also shown in the sim. It shows the process cpu usage, process' time stats (user,sys,real) and the cpu frequency stats. It uses a thread to sample the data, however the thread is not created until the menu is visited for the first time. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31364 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android')
-rw-r--r--android/android.make16
1 files changed, 13 insertions, 3 deletions
diff --git a/android/android.make b/android/android.make
index e4fd3693de..2f422be736 100644
--- a/android/android.make
+++ b/android/android.make
@@ -7,13 +7,19 @@
# $Id$
#
+# this is a glibc compatibility hack to provide a get_nprocs() replacement.
+# The NDK ships cpu-features.c which has a compatible function android_getCpuCount()
+CPUFEAT = /home/kugel/share/android-ndk-r6/sources/android/cpufeatures
+INCLUDES += -I$(CPUFEAT)
+OTHER_SRC += $(CPUFEAT)/cpu-features.c
+$(BUILDDIR)/cpu-features.o: $(CPUFEAT)/cpu-features.c
+ $(call PRINTS,CC $(subst $(ANDROID_NDK_PATH)/,,$<))$(CC) -o $@ -c $^ \
+ $(GCCOPTS) -Wno-unused
+
.SECONDEXPANSION: # $$(JAVA_OBJ) is not populated until after this
.SECONDEXPANSION: # $$(OBJ) is not populated until after this
.PHONY: apk classes clean dex dirs libs jar
-$(BUILDDIR)/$(BINARY): $$(OBJ) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB)
- $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS)
-
PACKAGE=org.rockbox
PACKAGE_PATH=org/rockbox
ANDROID_DIR=$(ROOTDIR)/android
@@ -103,6 +109,10 @@ dex: $(DEX)
classes: $(R_OBJ) $(JAVA_OBJ)
+
+$(BUILDDIR)/$(BINARY): $$(OBJ) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB) $(BUILDDIR)/cpu-features.o
+ $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(LDOPTS) $(GLOBAL_LDOPTS)
+
$(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
$(call PRINTS,CP $(BINARY))cp $^ $@