summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2011-03-11 16:08:36 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2011-03-11 16:08:36 +0000
commit7228f2fa9faf587bab51f2e3c1727b7ca962b441 (patch)
treecc4b41ce54e48c48dc8c1cf9129f55981c241c51
parent78d0fdab9c11e256553c8ad7404856b58a4d3985 (diff)
downloadrockbox-7228f2fa9faf587bab51f2e3c1727b7ca962b441.tar.gz
rockbox-7228f2fa9faf587bab51f2e3c1727b7ca962b441.zip
Android: use APPEXTRA instead of makefile hack
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29567 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/apps.make3
-rwxr-xr-xtools/configure2
2 files changed, 1 insertions, 4 deletions
diff --git a/apps/apps.make b/apps/apps.make
index 844816d110..6afcd12b5c 100644
--- a/apps/apps.make
+++ b/apps/apps.make
@@ -8,9 +8,6 @@
8# 8#
9 9
10INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) 10INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))
11ifdef APP_TYPE
12 INCLUDES += -I$(APPSDIR)/hosted -I$(APPSDIR)/hosted/$(APP_TYPE)
13endif
14SRC += $(call preprocess, $(APPSDIR)/SOURCES) 11SRC += $(call preprocess, $(APPSDIR)/SOURCES)
15 12
16# apps/features.txt is a file that (is preprocessed and) lists named features 13# apps/features.txt is a file that (is preprocessed and) lists named features
diff --git a/tools/configure b/tools/configure
index eaa391c3e7..852c388bb7 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2992,7 +2992,7 @@ fi
2992 bmp2rb_native="$rootdir/tools/bmp2rb -f 4" 2992 bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
2993 output="librockbox.so" 2993 output="librockbox.so"
2994 bootoutput="librockbox.so" 2994 bootoutput="librockbox.so"
2995 appextra="recorder:gui:radio:hosted" 2995 appextra="recorder:gui:radio:hosted/android"
2996 plugins="yes" 2996 plugins="yes"
2997 swcodec="yes" 2997 swcodec="yes"
2998 # architecture, manufacturer and model for the target-tree build 2998 # architecture, manufacturer and model for the target-tree build