commit 458249e703bded3a1cbd25a2ab2249f9366a8188
author Ken Wakasa <kwakasa@google.com> Wed Jan 05 00:39:41 2011 +0900
committer Ken Wakasa <kwakasa@google.com> Wed Jan 05 11:31:58 2011 +0900
tree 9a2f02ed25db681adb72e6ddf54049b3dc22291c
parent a96574fdd5e38a237a35b21a2b7c20a29138c648

Consolidate main dictionary files.

This change is a preparation for upcoming optimizations on dictionary file loading.
* We can consolidate dictionary files because we are no longer relying on Asset Manager.
* Stopping compressing dictionary files as planning to use mmap() on the region in the apk file.
* Probably we won't rely on Asset Manager.  Instead we'll probably use offset and size obtained from AssetFileDescriptor.

Change-Id: Id57dce512fd3d2397a58628f8264bd824194da76

native/Android.mk

diff --git a/native/Android.mk b/native/Android.mk
index 2de3892..38465ac 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -12,13 +12,20 @@
 
 #FLAG_DBG := true
 
-ifneq ($(TARGET_ARCH),x86)
-ifneq ($(FLAG_DBG), true)
-    LOCAL_NDK_VERSION := 4
+TARGETING_UNBUNDLED_FROYO := true
+
+ifeq ($(TARGET_ARCH), x86)
+    TARGETING_UNBUNDLED_FROYO := false
 endif
 
-LOCAL_SDK_VERSION := 8
-endif #TARGET_ARCH = x86
+ifeq ($(FLAG_DBG), true)
+    TARGETING_UNBUNDLED_FROYO := false
+endif
+
+ifeq ($(TARGETING_UNBUNDLED_FROYO), true)
+    LOCAL_NDK_VERSION := 4
+    LOCAL_SDK_VERSION := 8
+endif
 
 LOCAL_MODULE := libjni_latinime