Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5 -s ours am: 9467382a44 -s ours
am: 4a6a014605 -s ours
Change-Id: I7b16e3b03f740fc5004331e0f4de2ecdc8817c51
diff --git a/java/res/values-pt-rPT/strings-emoji-descriptions.xml b/java/res/values-pt-rPT/strings-emoji-descriptions.xml
index 6bc3dce..1096aac 100644
--- a/java/res/values-pt-rPT/strings-emoji-descriptions.xml
+++ b/java/res/values-pt-rPT/strings-emoji-descriptions.xml
@@ -25,7 +25,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Símbolo de Direitos de Autor"</string>
+ <string name="spoken_emoji_00A9" msgid="2859822817116803638">"Símbolo de direitos de autor"</string>
<string name="spoken_emoji_00AE" msgid="7708335454134589027">"Símbolo de marca registada"</string>
<string name="spoken_emoji_203C" msgid="153340916701508663">"Duplo ponto de exclamação"</string>
<string name="spoken_emoji_2049" msgid="4877256448299555371">"Pontos de exclamação e de interrogação"</string>
diff --git a/tests/Android.mk b/tests/Android.mk
index 12d9cbe..998c1de 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -26,8 +26,9 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
- mockito-target-minus-junit4 \
- legacy-android-test
+ mockito-target-minus-junit4
+
+LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index 6852b82..4981629 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 @@
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 622a9f1..510f18c 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 @@
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 @@
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 :=