Merge "Cleanup Makefiles of LatinIME" into jb-dev (7b1570e6) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/Android.mk

+0 −28

Original line number	Diff line number	Diff line
		@@ -20,24 +20,6 @@ LOCAL_PATH := $(call my-dir)
		#FLAG_DBG := true
		#FLAG_DO_PROFILE := true

		TARGETING_UNBUNDLED_FROYO := true

		ifeq ($(TARGET_ARCH), x86)
		TARGETING_UNBUNDLED_FROYO := false
		endif

		ifeq ($(TARGET_ARCH), mips)
		TARGETING_UNBUNDLED_FROYO := false
		endif

		ifeq ($(FLAG_DBG), true)
		TARGETING_UNBUNDLED_FROYO := false
		endif

		ifeq ($(FLAG_DO_PROFILE), true)
		TARGETING_UNBUNDLED_FROYO := false
		endif

		######################################
		include $(CLEAR_VARS)

		@@ -69,11 +51,6 @@ LOCAL_SRC_FILES := \
		$(LATIN_IME_JNI_SRC_FILES) \
		$(addprefix $(LATIN_IME_SRC_DIR)/,$(LATIN_IME_CORE_SRC_FILES))

		ifeq ($(TARGETING_UNBUNDLED_FROYO), true)
		LOCAL_NDK_VERSION := 4
		LOCAL_SDK_VERSION := 8
		endif

		ifeq ($(FLAG_DO_PROFILE), true)
		$(warning Making profiling version of native library)
		LOCAL_CFLAGS += -DFLAG_DO_PROFILE
		@@ -117,11 +94,6 @@ ifeq ($(FLAG_DBG), true)
		endif # FLAG_DBG
		endif # FLAG_DO_PROFILE

		ifeq ($(TARGETING_UNBUNDLED_FROYO), true)
		LOCAL_NDK_VERSION := 4
		LOCAL_SDK_VERSION := 8
		endif

		LOCAL_MODULE := libjni_latinime
		LOCAL_MODULE_TAGS := optional

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \
		$(filter-out $(addprefix %, $(LOCAL_TOOL_SRC_FILES)), $(LOCAL_MAIN_SRC_FILES))
		LOCAL_SRC_FILES += $(call all-java-files-under,tests)
		LOCAL_JAR_MANIFEST := etc/manifest.txt
		LOCAL_MODULE_TAGS := eng
		LOCAL_MODULE := makedict
		LOCAL_JAVA_LIBRARIES := junit

+0 −2

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

		LOCAL_MODULE_TAGS := eng

		LOCAL_PREBUILT_EXECUTABLES := makedict
		include $(BUILD_HOST_PREBUILT)