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

Merge "Prepare for master merge - Rename the jni library name - Revert the local cert - LatinIme2Google -> LatinIME Please note that we'll use the new package name: com.google.android.inputmethod.latin"

main
Ken Wakasa 2010-07-20 00:51:23 -07:00 committed by Gerrit Code Review
parent 9ebcc21450 debd74c678
commit 9a5d3cd9a5
5 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/Android.mk
View File

@ -5,17 +5,18 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := LatinIme2Google LOCAL_PACKAGE_NAME := LatinIME
LOCAL_CERTIFICATE := vendor/google/certs/app LOCAL_CERTIFICATE := shared
LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime2 LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_STATIC_JAVA_LIBRARIES := android-common
#LOCAL_AAPT_FLAGS := -0 .dict #LOCAL_AAPT_FLAGS := -0 .dict
# The following flag is required because we use a different package name # The following flag is required because we use a different package name
# com.google.android.inputmethod.latin in the LatinIME sandbox. # com.google.android.inputmethod.latin than Java package name
# com.android.inputmethod.latin
LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin
LOCAL_SDK_VERSION := 8 LOCAL_SDK_VERSION := 8

6
java/AndroidManifest.xml
View File

@ -1,9 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.inputmethod.latin" package="com.google.android.inputmethod.latin">
android:versionCode="21"
android:versionName="0.21">
<uses-sdk android:minSdkVersion="8"></uses-sdk>
<original-package android:name="com.android.inputmethod.latin" /> <original-package android:name="com.android.inputmethod.latin" />

4
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -53,9 +53,9 @@ public class BinaryDictionary extends Dictionary {
static { static {
try { try {
System.loadLibrary("jni_latinime2"); System.loadLibrary("jni_latinime");
} catch (UnsatisfiedLinkError ule) { } catch (UnsatisfiedLinkError ule) {
Log.e("BinaryDictionary", "Could not load native library jni_latinime2"); Log.e("BinaryDictionary", "Could not load native library jni_latinime");
} }
} }

8
native/Android.mk
View File

@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/src $(JNI_H_INCLUDE) LOCAL_C_INCLUDES += $(LOCAL_PATH)/src
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
jni/com_android_inputmethod_latin_BinaryDictionary.cpp \ jni/com_android_inputmethod_latin_BinaryDictionary.cpp \
@ -16,10 +16,8 @@ else
LOCAL_C_INCLUDES += $(JNI_H_INCLUDE) LOCAL_C_INCLUDES += $(JNI_H_INCLUDE)
endif endif
LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libjni_latinime
LOCAL_MODULE := libjni_latinime2 LOCAL_MODULE_TAGS := user
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
tests/Android.mk
View File

@ -10,8 +10,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := LatinIME2Tests LOCAL_PACKAGE_NAME := LatinIMETests
LOCAL_INSTRUMENTATION_FOR := LatinIme2Google LOCAL_INSTRUMENTATION_FOR := LatinIME
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)