From 7c4bfcaec18e0f40e03c9e90edf8a15f21cbc639 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 15:57:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/RtspNativeCodec/app/build.gradle | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/build.gradle b/VisitFace/RtspNativeCodec/app/build.gradle
index 8dfd037..aeb36b1 100644
--- a/VisitFace/RtspNativeCodec/app/build.gradle
+++ b/VisitFace/RtspNativeCodec/app/build.gradle
@@ -1,20 +1,20 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 23
- buildToolsVersion '23.0.2'
+ compileSdkVersion 22
+ buildToolsVersion '25.0.2'
defaultConfig {
applicationId 'com.example.nativecodec'
- minSdkVersion 21
- targetSdkVersion 22
+ minSdkVersion 22
+ targetSdkVersion 23
ndk {
//abiFilters 'armeabi-v7a', 'x86' , 'x86_64', 'armeabi' , 'arm64-v8a'
- abiFilters 'x86'
+ abiFilters 'armeabi-v7a'
}
externalNativeBuild {
cmake {
- arguments '-DANDROID_PLATFORM=android-21',
- '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=gnustl_static'
+ arguments '-DANDROID_PLATFORM=android-22',
+ '-DANDROID_TOOLCHAIN=gcc', '-DANDROID_STL=gnustl_static'
}
}
}
@@ -24,12 +24,20 @@
proguardFiles getDefaultProguardFile('proguard-android.txt'),
'proguard-rules.pro'
}
+ debug {
+ jniDebuggable false
+ }
}
externalNativeBuild {
cmake {
path 'src/main/cpp/CMakeLists.txt'
}
}
+ sourceSets {
+ main {
+ jniLibs.srcDirs = ['libs/opencv/lib', 'libs/protobuf/lib', 'libs/st_face/lib', 'libs/freetype/lib']
+ }
+ }
}
dependencies {
--
Gitblit v1.8.0