From a8b07ffc679a9662f9b6a94a097f8b491ff232e8 Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 07 三月 2017 11:33:25 +0800
Subject: [PATCH] 框架搭建完成，工作交接
---
VisitFace/DemoForBsk/app/build.gradle | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build.gradle b/VisitFace/DemoForBsk/app/build.gradle
index f6d5f69..c93a2ff 100644
--- a/VisitFace/DemoForBsk/app/build.gradle
+++ b/VisitFace/DemoForBsk/app/build.gradle
@@ -1,20 +1,37 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.2"
+ compileSdkVersion 23
+ buildToolsVersion "23.0.3"
defaultConfig {
applicationId "com.bsk.zhangbo.demoforbsk"
minSdkVersion 21
- targetSdkVersion 25
+ targetSdkVersion 23
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+ ndk {
+ abiFilters 'x86', 'x86_64', 'armeabi', 'armeabi-v7a', 'arm64-v8a'
+ }
+ externalNativeBuild {
+ cmake {
+ arguments '-DANDROID_PLATFORM=android-21',
+ '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=gnustl_static'
+ }
+ }
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+
+ externalNativeBuild {
+ cmake {
+ path 'src/main/cpp/CMakeLists.txt'
}
}
}
@@ -24,9 +41,11 @@
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support:appcompat-v7:25.1.0'
+ compile 'com.android.support:appcompat-v7:23.1.0'
testCompile 'junit:junit:4.12'
- compile 'com.android.support:design:25.1.0'
+ compile 'com.android.support:design:23.1.0'
compile 'com.camnter.easyrecyclerview:easyrecyclerview:1.3'
-
+ compile 'com.facebook.fresco:fresco:1.1.0'
+ compile 'com.wx.wheelview:wheelview:1.3.3'
+ compile 'com.google.code.gson:gson:2.8.0'
}
--
Gitblit v1.8.0