* only build rtl/android/jvm for android/jvm, not also rtl/android

git-svn-id: trunk@23958 -

rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-03-22 rev 23956]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
@@ -268,6 +268,19 @@ ifdef CROSSCOMPILE
 ifndef DARWIN2DARWIN
 ifneq ($(CPU_TARGET),jvm)
 BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
+ifeq ($(OS_TARGET),android)
+ifeq ($(CPU_TARGET),arm)
+BINUTILSPREFIX=arm-linux-androideabi-
+else
+ifeq ($(CPU_TARGET),i386)
+BINUTILSPREFIX=i686-linux-android-
+else
+ifeq ($(CPU_TARGET),mips)
+BINUTILSPREFIX=mipsel-linux-android-
+endif
+endif
+endif
+endif
 endif
 endif
 endif
@@ -506,7 +519,7 @@ ifeq ($(FULL_TARGET),jvm-java)
 override TARGET_DIRS+=java
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_DIRS+=android android/jvm
+override TARGET_DIRS+=android/jvm
 endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_CREATEPACKAGEFPC=y
@@ -1827,7 +1840,6 @@ ifeq ($(FULL_TARGET),jvm-java)
 TARGET_DIRS_JAVA=1
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-TARGET_DIRS_ANDROID=1
 TARGET_DIRS_ANDROID/JVM=1
 endif
 ifdef TARGET_DIRS_LINUX

rtl/Makefile.fpc

@@ -7,7 +7,6 @@ name=rtl
 version=2.7.1
 
 [target]
-dirs_android=android
 dirs_linux=linux
 dirs_win32=win32
 dirs_wince=wince
@@ -38,6 +37,8 @@ dirs_nativent=nativent
 dirs_wii=wii
 dirs_aix=aix
 dirs_java=java
+dirs_i386_android=android
+dirs_arm_android=android
 dirs_jvm_android=android/jvm
 
 [install]