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

am 60af4f03: Fix dicttool_aosp build

Browse source 
* commit '60af4f03a82e8af71e1eb56cd4caed567c003fd4':
  Fix dicttool_aosp build
This commit is contained in:
Ken Wakasa 2012-09-09 21:03:05 -07:00 committed by Android Git Automerger
commit a4717f27cd
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/Constants.java
View file

@ -16,8 +16,6 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import android.view.inputmethod.EditorInfo;
public final class Constants { public final class Constants {
public static final class Color { public static final class Color {
/** /**
@ -54,7 +52,7 @@ public final class Constants {
* The private IME option used to indicate that the given text field needs ASCII code points * The private IME option used to indicate that the given text field needs ASCII code points
* input. * input.
* *
* @deprecated Use {@link EditorInfo#IME_FLAG_FORCE_ASCII}. * @deprecated Use EditorInfo#IME_FLAG_FORCE_ASCII.
*/ */
@SuppressWarnings("dep-ann") @SuppressWarnings("dep-ann")
public static final String FORCE_ASCII = "forceAscii"; public static final String FORCE_ASCII = "forceAscii";

7
tools/dicttool/Android.mk
View file

@ -16,13 +16,16 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
MAKEDICT_CORE_SOURCE_DIRECTORY := ../../java/src/com/android/inputmethod/latin/makedict LATINIME_CORE_SOURCE_DIRECTORY := ../../java/src/com/android/inputmethod/latin
MAKEDICT_CORE_SOURCE_DIRECTORY := $(LATINIME_CORE_SOURCE_DIRECTORY)/makedict
LOCAL_MAIN_SRC_FILES := $(call all-java-files-under,$(MAKEDICT_CORE_SOURCE_DIRECTORY)) LOCAL_MAIN_SRC_FILES := $(call all-java-files-under,$(MAKEDICT_CORE_SOURCE_DIRECTORY))
LOCAL_TOOL_SRC_FILES := $(call all-java-files-under,src) LOCAL_TOOL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \
$(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \ $(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \
$(call all-java-files-under,tests) $(call all-java-files-under,tests) \
$(LATINIME_CORE_SOURCE_DIRECTORY)/Constants.java
LOCAL_JAR_MANIFEST := etc/manifest.txt LOCAL_JAR_MANIFEST := etc/manifest.txt
LOCAL_MODULE := dicttool_aosp LOCAL_MODULE := dicttool_aosp
LOCAL_JAVA_LIBRARIES := junit LOCAL_JAVA_LIBRARIES := junit