diff options
| author |   Jean-Baptiste Queru <jbq@google.com> | 2012-02-14 13:09:49 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-02-14 13:09:49 -0800 |
| commit | 26e315785d9a1c48e7590ccc1f59d8b7211e39f4 (patch) | |
| tree | 47a08487908068b92a84b9279059cae2a95dd149 | |
| parent | ad0987c33b70a9e60c08f81faadde377ce84acd1 (diff) | |
| parent | 3ad1145a8f055eee0c4eff18606edf611c9dc7f6 (diff) | |
| download | latinime-26e315785d9a1c48e7590ccc1f59d8b7211e39f4.tar.gz latinime-26e315785d9a1c48e7590ccc1f59d8b7211e39f4.tar.xz latinime-26e315785d9a1c48e7590ccc1f59d8b7211e39f4.zip | |
resolved conflicts for merge of 3ad1145a to master
Change-Id: I13159b95f90c5095373951bf9e91b7dbf8b14558
| -rw-r--r-- | native/jni/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 53bd21ddc..7e5953b7c 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -51,6 +51,10 @@ ifeq ($(TARGET_ARCH), x86) TARGETING_UNBUNDLED_FROYO := false endif +ifeq ($(TARGET_ARCH), mips) + TARGETING_UNBUNDLED_FROYO := false +endif + ifeq ($(FLAG_DBG), true) TARGETING_UNBUNDLED_FROYO := false endif |