* Fixed conflict of native android and java android targets.

git-svn-id: branches/targetandroid@23409 -

utils/fpcm/fpcmake.ini

@@ -9,7 +9,7 @@
 
 # OS categories
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) solaris qnx haiku aix android
+UNIXs = linux $(BSDs) solaris qnx haiku aix 
 LIMIT83fs = go32v2 os2 emx watcom
 OSNeedsComspecToRunBatch = go32v2 watcom
 
@@ -871,13 +871,15 @@ SHORTSUFFIX=wat
 IMPORTLIBPREFIX=
 endif
 
-# Android
+# Android native
+ifneq ($(CPU_TARGET),jvm)
 ifeq ($(OS_TARGET),android)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=lnx
 endif
+endif
 
 # Linux
 ifeq ($(OS_TARGET),linux)
@@ -1062,13 +1064,15 @@ SHAREDLIBEXT=.jar
 SHORTSUFFIX=java
 endif
 
-# Android
+# Android java
+ifeq ($(CPU_TARGET),jvm)
 ifeq ($(OS_TARGET),android)
 OEXT=.class
 ASMEXT=.j
 SHAREDLIBEXT=.jar
 SHORTSUFFIX=android
 endif
+endif
 
 
 # For 8.3 limited OS's the short suffixes