commit 1c80a1f2f0e746c380fde60297127ea2ad4fab79
author Björn Stenberg <bjorn@haxx.se> Mon Sep 20 22:04:32 2010 +0000
committer Björn Stenberg <bjorn@haxx.se> Mon Sep 20 22:04:32 2010 +0000
tree 108d78092ea3b07c3df3bd5daf51679f425bb283
parent 23dee22ec7e6990385194536b9ac4194aa085bc8

Stricter subst to avoid erroneous substitution.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28130 a1c6a512-1295-4272-9138-f99709370657

android/android.make

diff --git a/android/android.make b/android/android.make
index 3559660..16fdb12 100644
--- a/android/android.make
+++ b/android/android.make
@@ -37,7 +37,7 @@
 R_OBJ		:= $(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class
 
 JAVA_SRC	:= $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/*.java)
-JAVA_OBJ	:= $(call java2class,$(subst /src/,/bin/,$(JAVA_SRC)))
+JAVA_OBJ	:= $(call java2class,$(subst $(ANDROID)/src/$(PACKAGE_PATH),$(ANDROID)/bin/$(PACKAGE_PATH),$(JAVA_SRC)))
 
 LIBS		:= $(BINLIB_DIR)/$(BINARY) $(BINLIB_DIR)/libmisc.so
 TEMP_APK	:= $(BUILDDIR)/bin/_Rockbox.apk