mirror of
https://github.com/opencv/opencv.git
synced 2024-11-28 21:20:18 +08:00
Tegra3 package support enabled;
Version code incremented;
This commit is contained in:
parent
d65920d2f7
commit
ddcc839519
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="org.opencv.engine"
|
package="org.opencv.engine"
|
||||||
android:versionCode="12"
|
android:versionCode="13"
|
||||||
android:versionName="1.2" >
|
android:versionName="1.3" >
|
||||||
|
|
||||||
<uses-sdk android:minSdkVersion="8" />
|
<uses-sdk android:minSdkVersion="8" />
|
||||||
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
|
||||||
|
@ -25,7 +25,7 @@ LOCAL_C_INCLUDES := \
|
|||||||
|
|
||||||
LOCAL_CFLAGS += -DPLATFORM_ANDROID
|
LOCAL_CFLAGS += -DPLATFORM_ANDROID
|
||||||
LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_V7A_FEATURES
|
LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_V7A_FEATURES
|
||||||
#LOCAL_CFLAGS += -D__SUPPORT_TEGRA3
|
LOCAL_CFLAGS += -D__SUPPORT_TEGRA3
|
||||||
#LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES
|
#LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES
|
||||||
|
|
||||||
LOCAL_PRELINK_MODULE := false
|
LOCAL_PRELINK_MODULE := false
|
||||||
@ -66,7 +66,7 @@ LOCAL_PRELINK_MODULE := false
|
|||||||
|
|
||||||
LOCAL_CFLAGS += -DPLATFORM_ANDROID
|
LOCAL_CFLAGS += -DPLATFORM_ANDROID
|
||||||
LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_V7A_FEATURES
|
LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_V7A_FEATURES
|
||||||
#LOCAL_CFLAGS += -D__SUPPORT_TEGRA3
|
LOCAL_CFLAGS += -D__SUPPORT_TEGRA3
|
||||||
#LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES
|
#LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES
|
||||||
|
|
||||||
LOCAL_MODULE := libOpenCVEngine_jni
|
LOCAL_MODULE := libOpenCVEngine_jni
|
||||||
|
@ -32,7 +32,7 @@ LOCAL_C_INCLUDES := \
|
|||||||
|
|
||||||
LOCAL_CFLAGS += -O0 -DGTEST_HAS_CLONE=0 -DGTEST_OS_LINUX_ANDROID=1 -DGTEST_HAS_TR1_TUPLE=0
|
LOCAL_CFLAGS += -O0 -DGTEST_HAS_CLONE=0 -DGTEST_OS_LINUX_ANDROID=1 -DGTEST_HAS_TR1_TUPLE=0
|
||||||
LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_V7A_FEATURES
|
LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_V7A_FEATURES
|
||||||
#LOCAL_CFLAGS += -D__SUPPORT_TEGRA3
|
LOCAL_CFLAGS += -D__SUPPORT_TEGRA3
|
||||||
#LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES
|
#LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES
|
||||||
|
|
||||||
LOCAL_LDFLAGS = -Wl,-allow-shlib-undefined
|
LOCAL_LDFLAGS = -Wl,-allow-shlib-undefined
|
||||||
|
Loading…
Reference in New Issue
Block a user