Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9
am: 5977a3cb18
am: 5c223f1b0b
am: ef9a07958f
Change-Id: I8a6fa664e6e1ef439b02ac22883318a1f328a4e7
main
commit
da16b03b60
|
@ -16,12 +16,6 @@
|
||||||
# Only build if it's explicitly requested, or running mm/mmm.
|
# Only build if it's explicitly requested, or running mm/mmm.
|
||||||
ifneq ($(ONE_SHOT_MAKEFILE)$(filter $(MAKECMDGOALS),dicttool_aosp),)
|
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)
|
LATINIME_DICTTOOL_AOSP_LOCAL_PATH := $(call my-dir)
|
||||||
LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH)
|
LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH)
|
||||||
LATINIME_HOST_NATIVE_LIBNAME := liblatinime-aosp-dicttool-host
|
LATINIME_HOST_NATIVE_LIBNAME := liblatinime-aosp-dicttool-host
|
||||||
|
@ -86,11 +80,8 @@ LOCAL_MODULE := dicttool_aosp
|
||||||
include $(BUILD_HOST_JAVA_LIBRARY)
|
include $(BUILD_HOST_JAVA_LIBRARY)
|
||||||
include $(LOCAL_PATH)/etc/Android.mk
|
include $(LOCAL_PATH)/etc/Android.mk
|
||||||
|
|
||||||
endif # Darwin - TODO: Remove this
|
|
||||||
|
|
||||||
# Clear our private variables
|
# Clear our private variables
|
||||||
LATINIME_DICTTOOL_AOSP_LOCAL_PATH :=
|
LATINIME_DICTTOOL_AOSP_LOCAL_PATH :=
|
||||||
LATINIME_LOCAL_DIR :=
|
LATINIME_LOCAL_DIR :=
|
||||||
LATINIME_HOST_OSNAME :=
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -13,10 +13,6 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# 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)
|
LOCAL_PATH := $(call my-dir)
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
|
@ -30,9 +26,6 @@ ifeq ($(FLAG_DBG), true)
|
||||||
endif #FLAG_DBG
|
endif #FLAG_DBG
|
||||||
|
|
||||||
LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated -Wno-unused-parameter -Wno-unused-function
|
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_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni
|
||||||
LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src
|
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)
|
include $(BUILD_HOST_SHARED_LIBRARY)
|
||||||
|
|
||||||
endif # Darwin - TODO: Remove this
|
|
||||||
|
|
||||||
# Clear our private variables
|
# Clear our private variables
|
||||||
include $(LOCAL_PATH)/$(LATINIME_NATIVE_JNI_DIR)/CleanupNativeFileList.mk
|
include $(LOCAL_PATH)/$(LATINIME_NATIVE_JNI_DIR)/CleanupNativeFileList.mk
|
||||||
LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../..
|
LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../..
|
||||||
LATINIME_HOST_OSNAME :=
|
|
||||||
|
|
Loading…
Reference in New Issue