diff options
| -rw-r--r-- | java/res/values-en-rXC/strings-action-keys.xml | 31 | ||||
| -rw-r--r-- | java/res/values-en-rXC/strings-appname.xml | 27 | ||||
| -rw-r--r-- | java/res/values-en-rXC/strings-config-important-notice.xml | 24 | ||||
| -rw-r--r-- | tools/dicttool/Android.mk | 9 | ||||
| -rw-r--r-- | tools/dicttool/NativeLib.mk | 10 |
5 files changed, 0 insertions, 101 deletions
diff --git a/java/res/values-en-rXC/strings-action-keys.xml b/java/res/values-en-rXC/strings-action-keys.xml deleted file mode 100644 index 7ce3ab8ce..000000000 --- a/java/res/values-en-rXC/strings-action-keys.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/* -** -** Copyright 2013, 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. -*/ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="label_go_key" msgid="4033615332628671065">"Go"</string> - <string name="label_next_key" msgid="5586407279258592635">"Next"</string> - <string name="label_previous_key" msgid="1421141755779895275">"Prev"</string> - <string name="label_done_key" msgid="7564866296502630852">"Done"</string> - <string name="label_send_key" msgid="482252074224462163">"Send"</string> - <string name="label_search_key" msgid="7965186050435796642">"Search"</string> - <string name="label_pause_key" msgid="2225922926459730642">"Pause"</string> - <string name="label_wait_key" msgid="5891247853595466039">"Wait"</string> -</resources> diff --git a/java/res/values-en-rXC/strings-appname.xml b/java/res/values-en-rXC/strings-appname.xml deleted file mode 100644 index 27a82ad7b..000000000 --- a/java/res/values-en-rXC/strings-appname.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/* -** -** Copyright 2013, 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. -*/ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="english_ime_name" msgid="5940510615957428904">"Android Keyboard (AOSP)"</string> - <string name="spell_checker_service_name" msgid="1254221805440242662">"Android Spell Checker (AOSP)"</string> - <string name="english_ime_settings" msgid="5760361067176802794">"Android Keyboard Settings (AOSP)"</string> - <string name="android_spell_checker_settings" msgid="6123949487832861885">"Android Spell Checker Settings (AOSP)"</string> -</resources> diff --git a/java/res/values-en-rXC/strings-config-important-notice.xml b/java/res/values-en-rXC/strings-config-important-notice.xml deleted file mode 100644 index 425322262..000000000 --- a/java/res/values-en-rXC/strings-config-important-notice.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/* -** -** Copyright 2014, 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. -*/ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="use_personalized_dicts_summary" msgid="590432261305469627">"Learn from your communications and typed data to improve suggestions"</string> -</resources> diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index 6852b82b4..49816294f 100644 --- a/tools/dicttool/Android.mk +++ b/tools/dicttool/Android.mk @@ -16,12 +16,6 @@ # Only build if it's explicitly requested, or running mm/mmm. ifneq ($(ONE_SHOT_MAKEFILE)$(filter $(MAKECMDGOALS),dicttool_aosp),) -# HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11. -LATINIME_HOST_OSNAME := $(shell uname -s) -ifeq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this -$(warning dicttool_aosp is not supported on $(LATINIME_HOST_OSNAME)) -else # TODO: Remove this - LATINIME_DICTTOOL_AOSP_LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH) LATINIME_HOST_NATIVE_LIBNAME := liblatinime-aosp-dicttool-host @@ -86,11 +80,8 @@ LOCAL_MODULE := dicttool_aosp include $(BUILD_HOST_JAVA_LIBRARY) include $(LOCAL_PATH)/etc/Android.mk -endif # Darwin - TODO: Remove this - # Clear our private variables LATINIME_DICTTOOL_AOSP_LOCAL_PATH := LATINIME_LOCAL_DIR := -LATINIME_HOST_OSNAME := endif diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk index 622a9f171..510f18c4e 100644 --- a/tools/dicttool/NativeLib.mk +++ b/tools/dicttool/NativeLib.mk @@ -13,10 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# HACK: Temporarily disable host tool build on Mac until the build system is ready for C++11. -LATINIME_HOST_OSNAME := $(shell uname -s) -ifneq ($(LATINIME_HOST_OSNAME), Darwin) # TODO: Remove this - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -30,9 +26,6 @@ ifeq ($(FLAG_DBG), true) endif #FLAG_DBG LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated -Wno-unused-parameter -Wno-unused-function -ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),) -LOCAL_MULTILIB := 64 -endif #HOST_JDK_IS_64BIT_VERSION LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src @@ -48,9 +41,6 @@ LOCAL_MODULE := $(LATINIME_HOST_NATIVE_LIBNAME) include $(BUILD_HOST_SHARED_LIBRARY) -endif # Darwin - TODO: Remove this - # Clear our private variables include $(LOCAL_PATH)/$(LATINIME_NATIVE_JNI_DIR)/CleanupNativeFileList.mk LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../.. -LATINIME_HOST_OSNAME := |