From e276c2401e5702222b21c4dfe2a25219c2f6619f Mon Sep 17 00:00:00 2001 From: Tom Ouyang Date: Wed, 21 Mar 2012 18:10:21 +0900 Subject: [PATCH] Move makedict to LatinIME android keyboard. Bug: 6188977 Change-Id: I4d2ef504bb983abbda3cb52ee450cb46f58d95cf --- .../latin/makedict/BinaryDictInputOutput.java | 0 .../latin/makedict/CharGroupInfo.java | 0 .../inputmethod/latin/makedict/Dummy.java | 21 ---------------- .../latin/makedict/FusionDictionary.java | 0 .../latin/makedict/MakedictLog.java | 0 .../latin/makedict/PendingAttribute.java | 0 .../makedict/UnsupportedFormatException.java | 0 .../inputmethod/latin/makedict/Word.java | 0 tools/makedict/Android.mk | 24 +++++++++---------- 9 files changed, 12 insertions(+), 33 deletions(-) rename {tools/makedict => java}/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java (100%) rename {tools/makedict => java}/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java (100%) delete mode 100644 java/src/com/android/inputmethod/latin/makedict/Dummy.java rename {tools/makedict => java}/src/com/android/inputmethod/latin/makedict/FusionDictionary.java (100%) rename {tools/makedict => java}/src/com/android/inputmethod/latin/makedict/MakedictLog.java (100%) rename {tools/makedict => java}/src/com/android/inputmethod/latin/makedict/PendingAttribute.java (100%) rename {tools/makedict => java}/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java (100%) rename {tools/makedict => java}/src/com/android/inputmethod/latin/makedict/Word.java (100%) diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java similarity index 100% rename from tools/makedict/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java rename to java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java b/java/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java similarity index 100% rename from tools/makedict/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java rename to java/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java diff --git a/java/src/com/android/inputmethod/latin/makedict/Dummy.java b/java/src/com/android/inputmethod/latin/makedict/Dummy.java deleted file mode 100644 index 27ea5ace6..000000000 --- a/java/src/com/android/inputmethod/latin/makedict/Dummy.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.android.inputmethod.latin.makedict; - -public class Dummy { - -} diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/FusionDictionary.java b/java/src/com/android/inputmethod/latin/makedict/FusionDictionary.java similarity index 100% rename from tools/makedict/src/com/android/inputmethod/latin/makedict/FusionDictionary.java rename to java/src/com/android/inputmethod/latin/makedict/FusionDictionary.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/MakedictLog.java b/java/src/com/android/inputmethod/latin/makedict/MakedictLog.java similarity index 100% rename from tools/makedict/src/com/android/inputmethod/latin/makedict/MakedictLog.java rename to java/src/com/android/inputmethod/latin/makedict/MakedictLog.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/PendingAttribute.java b/java/src/com/android/inputmethod/latin/makedict/PendingAttribute.java similarity index 100% rename from tools/makedict/src/com/android/inputmethod/latin/makedict/PendingAttribute.java rename to java/src/com/android/inputmethod/latin/makedict/PendingAttribute.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java b/java/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java similarity index 100% rename from tools/makedict/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java rename to java/src/com/android/inputmethod/latin/makedict/UnsupportedFormatException.java diff --git a/tools/makedict/src/com/android/inputmethod/latin/makedict/Word.java b/java/src/com/android/inputmethod/latin/makedict/Word.java similarity index 100% rename from tools/makedict/src/com/android/inputmethod/latin/makedict/Word.java rename to java/src/com/android/inputmethod/latin/makedict/Word.java diff --git a/tools/makedict/Android.mk b/tools/makedict/Android.mk index 6832b1cb6..facbbf7b8 100644 --- a/tools/makedict/Android.mk +++ b/tools/makedict/Android.mk @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under,src) -LOCAL_SRC_FILES += $(call all-java-files-under,tests) -LOCAL_JAR_MANIFEST := etc/manifest.txt -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE := makedict -LOCAL_JAVA_LIBRARIES := junit - -include $(BUILD_HOST_JAVA_LIBRARY) -include $(LOCAL_PATH)/etc/Android.mk +#LOCAL_PATH := $(call my-dir) +#include $(CLEAR_VARS) +# +#LOCAL_SRC_FILES := $(call all-java-files-under,src) +#LOCAL_SRC_FILES += $(call all-java-files-under,tests) +#LOCAL_JAR_MANIFEST := etc/manifest.txt +#LOCAL_MODULE_TAGS := eng +#LOCAL_MODULE := makedict +#LOCAL_JAVA_LIBRARIES := junit +# +#include $(BUILD_HOST_JAVA_LIBRARY) +#include $(LOCAL_PATH)/etc/Android.mk