Merge "Add latinime-common local lib" (d42df512) · Commits · e / os / android_packages_inputmethods_LatinIME

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,5 +12,5 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		subdirs := native java tests tools
		subdirs := common native java tests tools
		include $(call all-named-subdir-makefiles, $(subdirs))

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 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.

		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_MODULE := latinime-common
		LOCAL_SDK_VERSION := 21
		include $(BUILD_STATIC_JAVA_LIBRARY)

		# Also build a host side library
		include $(CLEAR_VARS)
		LOCAL_MODULE := latinime-common-host
		LOCAL_SRC_FILES := $(call all-java-files-under, src)
		include $(BUILD_HOST_JAVA_LIBRARY)

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.inputmethod.latin.makedict;
		package com.android.inputmethod.latin.common;

		import java.util.Random;

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,8 @@ LOCAL_CERTIFICATE := shared

		LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime

		LOCAL_STATIC_JAVA_LIBRARIES := android-common inputmethod-common android-support-v4 jsr305
		LOCAL_STATIC_JAVA_LIBRARIES := \
		android-common inputmethod-common android-support-v4 jsr305 latinime-common

		# Do not compress dictionary files to mmap dict data runtime
		LOCAL_AAPT_FLAGS := -0 .dict

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ LOCAL_AAPT_FLAGS += -0 .dict
		# Do not compress test data file
		LOCAL_AAPT_FLAGS += -0 .txt

		LOCAL_STATIC_JAVA_LIBRARIES := mockito-target android-support-test
		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test latinime-common mockito-target

		# Include all test java files.
		LOCAL_SRC_FILES := $(call all-java-files-under, src)