From 7228f2fa9faf587bab51f2e3c1727b7ca962b441 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Fri, 11 Mar 2011 16:08:36 +0000 Subject: [PATCH] Android: use APPEXTRA instead of makefile hack git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29567 a1c6a512-1295-4272-9138-f99709370657 --- apps/apps.make | 3 --- tools/configure | 2 +- 2 files changed, 1 insertion(+), 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 @@ # INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) -ifdef APP_TYPE - INCLUDES += -I$(APPSDIR)/hosted -I$(APPSDIR)/hosted/$(APP_TYPE) -endif SRC += $(call preprocess, $(APPSDIR)/SOURCES) # 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 bmp2rb_native="$rootdir/tools/bmp2rb -f 4" output="librockbox.so" bootoutput="librockbox.so" - appextra="recorder:gui:radio:hosted" + appextra="recorder:gui:radio:hosted/android" plugins="yes" swcodec="yes" # architecture, manufacturer and model for the target-tree build