nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove ".." in the native LOCAL_SRC_FILES."

main
Ying Wang 2012-03-30 11:00:34 -07:00 committed by Android (Google) Code Review
parent 25d59687c8 32f0e24b33
commit f24d1102ac
1 changed files with 67 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
native/jni/Android.mk
View File

@ -13,6 +13,32 @@
# limitations under the License. # limitations under the License.
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
############ some local flags
# If you change any of those flags, you need to rebuild both libjni_latinime_static
# and the shared library.
#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) include $(CLEAR_VARS)
LATIN_IME_SRC_DIR := src LATIN_IME_SRC_DIR := src
@ -43,26 +69,43 @@ LOCAL_SRC_FILES := \
$(LATIN_IME_JNI_SRC_FILES) \ $(LATIN_IME_JNI_SRC_FILES) \
$(addprefix $(LATIN_IME_SRC_DIR)/,$(LATIN_IME_CORE_SRC_FILES)) $(addprefix $(LATIN_IME_SRC_DIR)/,$(LATIN_IME_CORE_SRC_FILES))
#FLAG_DBG := true ifeq ($(TARGETING_UNBUNDLED_FROYO), true)
#FLAG_DO_PROFILE := true LOCAL_NDK_VERSION := 4
LOCAL_SDK_VERSION := 8
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 endif
ifeq ($(FLAG_DO_PROFILE), true) ifeq ($(FLAG_DO_PROFILE), true)
TARGETING_UNBUNDLED_FROYO := false $(warning Making profiling version of native library)
endif LOCAL_CFLAGS += -DFLAG_DO_PROFILE
else # FLAG_DO_PROFILE
ifeq ($(FLAG_DBG), true)
$(warning Making debug version of native library)
LOCAL_CFLAGS += -DFLAG_DBG
endif # FLAG_DBG
endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime_static
LOCAL_MODULE_TAGS := optional
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
######################################
include $(CLEAR_VARS)
# All code in LOCAL_WHOLE_STATIC_LIBRARIES will be built into this shared library.
LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_static
LOCAL_SHARED_LIBRARIES := libstlport
ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library)
LOCAL_SHARED_LIBRARIES += libcutils libutils
else # FLAG_DO_PROFILE
ifeq ($(FLAG_DBG), true)
$(warning Making debug version of native library)
LOCAL_SHARED_LIBRARIES += libcutils libutils
endif # FLAG_DBG
endif # FLAG_DO_PROFILE
ifeq ($(TARGETING_UNBUNDLED_FROYO), true) ifeq ($(TARGETING_UNBUNDLED_FROYO), true)
LOCAL_NDK_VERSION := 4 LOCAL_NDK_VERSION := 4
@ -70,23 +113,13 @@ ifeq ($(TARGETING_UNBUNDLED_FROYO), true)
endif endif
LOCAL_MODULE := libjni_latinime LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
# For STL include external/stlport/libstlport.mk
LOCAL_C_INCLUDES += external/stlport/stlport bionic
LOCAL_SHARED_LIBRARIES += libstlport
ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library)
LOCAL_CFLAGS += -DFLAG_DO_PROFILE
LOCAL_SHARED_LIBRARIES += libcutils libutils
else # FLAG_DO_PROFILE
ifeq ($(FLAG_DBG), true)
$(warning Making debug version of native library)
LOCAL_CFLAGS += -DFLAG_DBG
LOCAL_SHARED_LIBRARIES += libcutils libutils
endif # FLAG_DBG
endif # FLAG_DO_PROFILE
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
#################### Clean up the tmp vars
LATIN_IME_CORE_SRC_FILES :=
LATIN_IME_JNI_SRC_FILES :=
LATIN_IME_SRC_DIR :=
TARGETING_UNBUNDLED_FROYO :=