nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 3ad1145a to master 

Change-Id: I13159b95f90c5095373951bf9e91b7dbf8b14558
main
Jean-Baptiste Queru 2012-02-14 13:09:49 -08:00
parent ad0987c33b 3ad1145a8f
commit 26e315785d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/jni/Android.mk
View File

@ -51,6 +51,10 @@ ifeq ($(TARGET_ARCH), x86)
TARGETING_UNBUNDLED_FROYO := false TARGETING_UNBUNDLED_FROYO := false
endif endif
ifeq ($(TARGET_ARCH), mips)
TARGETING_UNBUNDLED_FROYO := false
endif
ifeq ($(FLAG_DBG), true) ifeq ($(FLAG_DBG), true)
TARGETING_UNBUNDLED_FROYO := false TARGETING_UNBUNDLED_FROYO := false
endif endif