am 4ed69eed: Merge "Move makedict to live under dicttool (A5)" into jb-mr1-dev

* commit '4ed69eed006c3e8a0b1ad8f3b0e23cd1cfb49679':
  Move makedict to live under dicttool (A5)

2 files changed, 19 insertions, 1 deletions

diff --git a/tools/dicttool/etc/Android.mk b/tools/dicttool/etc/Android.mk
index 03d4a96ee..1eab70fc1 100644
--- a/tools/dicttool/etc/Android.mk
+++ b/tools/dicttool/etc/Android.mk
@@ -16,5 +16,5 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := eng
-LOCAL_PREBUILT_EXECUTABLES := dicttool
+LOCAL_PREBUILT_EXECUTABLES := dicttool makedict
 include $(BUILD_HOST_PREBUILT)
diff --git a/tools/dicttool/etc/makedict b/tools/dicttool/etc/makedict
new file mode 100755
index 000000000..fffeb2376
--- /dev/null
+++ b/tools/dicttool/etc/makedict
@@ -0,0 +1,18 @@
+#!/bin/sh
+# 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.
+
+# Dicttool supports making the dictionary using the 'makedict' command and
+# the same arguments that the old 'makedict' command used to accept.
+dicttool makedict $@