diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2011-03-11 15:45:44 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2011-03-11 15:45:44 +0000 |
commit | d833e78fac8d311b30e265d4df9c3cdd6eb6d1e3 (patch) | |
tree | ad47c2b842a55a919eb3089657ec9fba3f25864b | |
parent | cae7560f32aa1067479580bf5abbfb3930a2a06b (diff) | |
download | rockbox-d833e78fac8d311b30e265d4df9c3cdd6eb6d1e3.tar.gz rockbox-d833e78fac8d311b30e265d4df9c3cdd6eb6d1e3.zip |
RaaA: move Android apps-code to separate dir under apps/hosted
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29563 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/SOURCES | 6 | ||||
-rw-r--r-- | apps/apps.make | 3 | ||||
-rw-r--r-- | apps/hosted/android/keyboard.c (renamed from apps/hosted/keyboard.c) | 0 | ||||
-rw-r--r-- | apps/hosted/android/notification.c (renamed from apps/hosted/notification.c) | 0 | ||||
-rw-r--r-- | apps/hosted/android/notification.h (renamed from apps/hosted/notification.h) | 0 | ||||
-rw-r--r-- | apps/hosted/android/yesno.c (renamed from apps/hosted/yesno.c) | 0 |
6 files changed, 6 insertions, 3 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 39b68ce6a6..c122427900 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -94,8 +94,8 @@ gui/statusbar.c | |||
94 | gui/statusbar-skinned.c | 94 | gui/statusbar-skinned.c |
95 | #endif | 95 | #endif |
96 | #if (CONFIG_PLATFORM&PLATFORM_ANDROID) | 96 | #if (CONFIG_PLATFORM&PLATFORM_ANDROID) |
97 | hosted/yesno.c | 97 | hosted/android/yesno.c |
98 | hosted/notification.c | 98 | hosted/android/notification.c |
99 | #else | 99 | #else |
100 | gui/yesno.c | 100 | gui/yesno.c |
101 | #endif | 101 | #endif |
@@ -126,7 +126,7 @@ player/keyboard.c | |||
126 | recorder/bmp.c | 126 | recorder/bmp.c |
127 | recorder/icons.c | 127 | recorder/icons.c |
128 | #if (CONFIG_PLATFORM&PLATFORM_ANDROID) | 128 | #if (CONFIG_PLATFORM&PLATFORM_ANDROID) |
129 | hosted/keyboard.c | 129 | hosted/android/keyboard.c |
130 | #else | 130 | #else |
131 | recorder/keyboard.c | 131 | recorder/keyboard.c |
132 | #endif | 132 | #endif |
diff --git a/apps/apps.make b/apps/apps.make index 6afcd12b5c..844816d110 100644 --- a/apps/apps.make +++ b/apps/apps.make | |||
@@ -8,6 +8,9 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) | 10 | INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) |
11 | ifdef APP_TYPE | ||
12 | INCLUDES += -I$(APPSDIR)/hosted -I$(APPSDIR)/hosted/$(APP_TYPE) | ||
13 | endif | ||
11 | SRC += $(call preprocess, $(APPSDIR)/SOURCES) | 14 | SRC += $(call preprocess, $(APPSDIR)/SOURCES) |
12 | 15 | ||
13 | # apps/features.txt is a file that (is preprocessed and) lists named features | 16 | # apps/features.txt is a file that (is preprocessed and) lists named features |
diff --git a/apps/hosted/keyboard.c b/apps/hosted/android/keyboard.c index 9407d970fd..9407d970fd 100644 --- a/apps/hosted/keyboard.c +++ b/apps/hosted/android/keyboard.c | |||
diff --git a/apps/hosted/notification.c b/apps/hosted/android/notification.c index 443200698c..443200698c 100644 --- a/apps/hosted/notification.c +++ b/apps/hosted/android/notification.c | |||
diff --git a/apps/hosted/notification.h b/apps/hosted/android/notification.h index d182c7f8e7..d182c7f8e7 100644 --- a/apps/hosted/notification.h +++ b/apps/hosted/android/notification.h | |||
diff --git a/apps/hosted/yesno.c b/apps/hosted/android/yesno.c index a1de64e3f9..a1de64e3f9 100644 --- a/apps/hosted/yesno.c +++ b/apps/hosted/android/yesno.c | |||