From ca6e85f52673c1afff6390a9e57d8e8cf1292282 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 16 Jul 2012 07:56:12 +0000 Subject: [PATCH] Tegra3 package support enabled; Version code incremented; --- android/service/engine/AndroidManifest.xml | 4 ++-- android/service/engine/jni/Android.mk | 4 ++-- android/service/engine/jni/Tests/Tests.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/service/engine/AndroidManifest.xml b/android/service/engine/AndroidManifest.xml index 9512c7b..5fee38f 100644 --- a/android/service/engine/AndroidManifest.xml +++ b/android/service/engine/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="13" + android:versionName="1.3" > diff --git a/android/service/engine/jni/Android.mk b/android/service/engine/jni/Android.mk index be73f6c..4ba3176 100644 --- a/android/service/engine/jni/Android.mk +++ b/android/service/engine/jni/Android.mk @@ -25,7 +25,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS += -DPLATFORM_ANDROID LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_V7A_FEATURES -#LOCAL_CFLAGS += -D__SUPPORT_TEGRA3 +LOCAL_CFLAGS += -D__SUPPORT_TEGRA3 #LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES LOCAL_PRELINK_MODULE := false @@ -66,7 +66,7 @@ LOCAL_PRELINK_MODULE := false LOCAL_CFLAGS += -DPLATFORM_ANDROID LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_V7A_FEATURES -#LOCAL_CFLAGS += -D__SUPPORT_TEGRA3 +LOCAL_CFLAGS += -D__SUPPORT_TEGRA3 #LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES LOCAL_MODULE := libOpenCVEngine_jni diff --git a/android/service/engine/jni/Tests/Tests.mk b/android/service/engine/jni/Tests/Tests.mk index 3dab5f0..9027e15 100644 --- a/android/service/engine/jni/Tests/Tests.mk +++ b/android/service/engine/jni/Tests/Tests.mk @@ -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 += -D__SUPPORT_ARMEABI_V7A_FEATURES -#LOCAL_CFLAGS += -D__SUPPORT_TEGRA3 +LOCAL_CFLAGS += -D__SUPPORT_TEGRA3 #LOCAL_CFLAGS += -D__SUPPORT_ARMEABI_FEATURES LOCAL_LDFLAGS = -Wl,-allow-shlib-undefined -- 2.7.4