diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-05-23 20:22:04 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-23 20:22:04 -0700 |
| commit | 7d81f3187198b1589edab3c7883c3ee94855ed7e (patch) | |
| tree | 25871bc90e5a19538bc65b2a00fb83429d900041 | |
| parent | 925212ff4b3d6ff4182a94a133c0e4a4f23dd6aa (diff) | |
| parent | 7b1570e60c2e04fe7d132df758476b34685eb709 (diff) | |
| download | latinime-7d81f3187198b1589edab3c7883c3ee94855ed7e.tar.gz latinime-7d81f3187198b1589edab3c7883c3ee94855ed7e.tar.xz latinime-7d81f3187198b1589edab3c7883c3ee94855ed7e.zip | |
am 7b1570e6: Merge "Cleanup Makefiles of LatinIME" into jb-dev
* commit '7b1570e60c2e04fe7d132df758476b34685eb709':
Cleanup Makefiles of LatinIME
| -rw-r--r-- | native/jni/Android.mk | 28 | ||||
| -rw-r--r-- | tools/makedict/Android.mk | 1 | ||||
| -rw-r--r-- | tools/makedict/etc/Android.mk | 2 |
3 files changed, 0 insertions, 31 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 5e0d3518d..d53757fd4 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -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 diff --git a/tools/makedict/Android.mk b/tools/makedict/Android.mk index 2f0957aa8..7b5dee2ce 100644 --- a/tools/makedict/Android.mk +++ b/tools/makedict/Android.mk @@ -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 diff --git a/tools/makedict/etc/Android.mk b/tools/makedict/etc/Android.mk index 96a90cbe0..1b7d7cf0e 100644 --- a/tools/makedict/etc/Android.mk +++ b/tools/makedict/etc/Android.mk @@ -15,7 +15,5 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := eng - LOCAL_PREBUILT_EXECUTABLES := makedict include $(BUILD_HOST_PREBUILT) |