Skip to content
Snippets Groups Projects
Commit 2912c654 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Manual merge from gingerbread-plus-aosp 

Change-Id: If048354f9b80bcaa1e97df5c31c3df80231eb612
parents f182f823 7b3e2b79
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
native/Android.mk
+ 2
− 0
View file @ 2912c654
...@@ -12,11 +12,13 @@ LOCAL_SRC_FILES := \ ...@@ -12,11 +12,13 @@ LOCAL_SRC_FILES := \
#FLAG_DBG := true #FLAG_DBG := true
ifneq ($(TARGET_ARCH),x86)
ifneq ($(FLAG_DBG), true) ifneq ($(FLAG_DBG), true)
LOCAL_NDK_VERSION := 4 LOCAL_NDK_VERSION := 4
endif endif
LOCAL_SDK_VERSION := 8 LOCAL_SDK_VERSION := 8
endif #TARGET_ARCH = x86
LOCAL_MODULE := libjni_latinime LOCAL_MODULE := libjni_latinime
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment