Automated import from //branches/cupcake/...@141926,141926
diff --git a/Android.mk b/Android.mk
index 3ebaa76..3ae7bfa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,8 +5,8 @@
 
 LOCAL_PACKAGE_NAME := OpenWnn
 
-LOCAL_JNI_SHARED_LIBRARIES := \
-	 libWnnEngDic libWnnJpnDic libWnnZHCNDic libwnndict
+# LOCAL_JNI_SHARED_LIBRARIES := \
+#	 libWnnEngDic libWnnJpnDic libWnnZHCNDic libwnndict
 
 include $(BUILD_PACKAGE)
 
diff --git a/src/jp/co/omronsoft/openwnn/EN/OpenWnnEngineEN.java b/src/jp/co/omronsoft/openwnn/EN/OpenWnnEngineEN.java
index 8c22db0..3e32b7c 100644
--- a/src/jp/co/omronsoft/openwnn/EN/OpenWnnEngineEN.java
+++ b/src/jp/co/omronsoft/openwnn/EN/OpenWnnEngineEN.java
@@ -76,7 +76,7 @@
         mOutputNum = 0;
 
         mDictionary = new OpenWnnDictionaryImpl( 
-            "/data/data/jp.co.omronsoft.openwnn/lib/libWnnEngDic.so",
+            "/system/lib/libWnnEngDic.so",
             writableDictionaryName);
 
         mDictionary.clearDictionary( );
diff --git a/src/jp/co/omronsoft/openwnn/JAJP/OpenWnnEngineJAJP.java b/src/jp/co/omronsoft/openwnn/JAJP/OpenWnnEngineJAJP.java
index 78a2307..2252f8d 100644
--- a/src/jp/co/omronsoft/openwnn/JAJP/OpenWnnEngineJAJP.java
+++ b/src/jp/co/omronsoft/openwnn/JAJP/OpenWnnEngineJAJP.java
@@ -129,7 +129,7 @@
     public OpenWnnEngineJAJP(String writableDictionaryName) {
         /* load Japanese dictionary library */
         mDictionaryJP = new OpenWnnDictionaryImpl(
-            "/data/data/jp.co.omronsoft.openwnn/lib/libWnnJpnDic.so",
+            "/system/lib/libWnnJpnDic.so",
             writableDictionaryName );
 
         /* clear dictionary settings */
diff --git a/src/jp/co/omronsoft/openwnn/OpenWnnZHCN.java b/src/jp/co/omronsoft/openwnn/OpenWnnZHCN.java
index 3c99b40..cbbf6c3 100644
--- a/src/jp/co/omronsoft/openwnn/OpenWnnZHCN.java
+++ b/src/jp/co/omronsoft/openwnn/OpenWnnZHCN.java
@@ -345,7 +345,7 @@
         mInputViewManager  = new DefaultSoftKeyboardZH();
 
         mConverter = mConverterZHCN = new OpenWnnEngineZHCN(
-                "/data/data/jp.co.omronsoft.openwnn/lib/libWnnZHCNDic.so",
+                "/system/lib/libWnnZHCNDic.so",
                 "/data/data/jp.co.omronsoft.openwnn/writableZHCN.dic");
 
         mConverterEN = new OpenWnnEngineEN("/data/data/jp.co.omronsoft.openwnn/writableEN.dic");
@@ -2171,4 +2171,3 @@
     }
 
 }
-