Merge "Rename maketext tool to make-keyboard-text" (d03e5bd7) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -27,18 +27,18 @@ import java.util.HashMap;
		/**
		* !!!!! DO NOT EDIT THIS FILE !!!!!
		*
		* This file is generated by tools/maketext. The base template file is
		* tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
		* This file is generated by tools/make-keyboard-text. The base template file is
		* tools/make-keyboard-text/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
		*
		* This file must be updated when any text resources in keyboard layout files have been changed.
		* These text resources are referred as "!text/<resource_name>" in keyboard XML definitions,
		* and should be defined in
		* tools/maketext/res/values-<locale>/donottranslate-more-keys.xml
		* tools/make-keyboard-text/res/values-<locale>/donottranslate-more-keys.xml
		*
		* To update this file, please run the following commands.
		* $ cd $ANDROID_BUILD_TOP
		* $ mmm packages/inputmethods/LatinIME/tools/maketext
		* $ maketext -java packages/inputmethods/LatinIME/java/src
		* $ mmm packages/inputmethods/LatinIME/tools/make-keyboard-text
		* $ make-keyboard-text -java packages/inputmethods/LatinIME/java/src
		*
		* The updated source file will be generated to the following path (this file).
		* packages/inputmethods/LatinIME/java/src/com/android/inputmethod/keyboard/internal/

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ include $(CLEAR_VARS)
		LOCAL_SRC_FILES += $(call all-java-files-under,src)
		LOCAL_JAR_MANIFEST := etc/manifest.txt
		LOCAL_JAVA_RESOURCE_DIRS := res
		LOCAL_MODULE := maketext
		LOCAL_MODULE := make-keyboard-text

		include $(BUILD_HOST_JAVA_LIBRARY)
		include $(LOCAL_PATH)/etc/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,6 @@
		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_PREBUILT_EXECUTABLES := maketext
		LOCAL_PREBUILT_EXECUTABLES := make-keyboard-text

		include $(BUILD_HOST_PREBUILT)

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ progdir=`pwd`
		prog="${progdir}"/`basename "${prog}"`
		cd "${oldwd}"

		jarfile=maketext.jar
		jarfile=make-keyboard-text.jar
		frameworkdir="$progdir"
		if [ ! -r "$frameworkdir/$jarfile" ]
		then

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		Main-Class: com.android.inputmethod.keyboard.tools.MakeKeyboardText