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 | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/build.gradle b/VisitFace/RtspNativeCodec/app/build.gradle
index 512e7b4..aeb36b1 100644
--- a/VisitFace/RtspNativeCodec/app/build.gradle
+++ b/VisitFace/RtspNativeCodec/app/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 21
+ compileSdkVersion 22
buildToolsVersion '25.0.2'
defaultConfig {
applicationId 'com.example.nativecodec'
- minSdkVersion 17
- targetSdkVersion 22
+ minSdkVersion 22
+ targetSdkVersion 23
ndk {
//abiFilters 'armeabi-v7a', 'x86' , 'x86_64', 'armeabi' , 'arm64-v8a'
abiFilters 'armeabi-v7a'
@@ -24,6 +24,9 @@
proguardFiles getDefaultProguardFile('proguard-android.txt'),
'proguard-rules.pro'
}
+ debug {
+ jniDebuggable false
+ }
}
externalNativeBuild {
cmake {
@@ -32,7 +35,7 @@
}
sourceSets {
main {
- jniLibs.srcDirs = ['libs/opencv/lib', 'libs/protobuf/lib', 'libs/st_face/lib']
+ jniLibs.srcDirs = ['libs/opencv/lib', 'libs/protobuf/lib', 'libs/st_face/lib', 'libs/freetype/lib']
}
}
}
--
Gitblit v1.8.0