File tree Expand file tree Collapse file tree 6 files changed +16
-18
lines changed Expand file tree Collapse file tree 6 files changed +16
-18
lines changed Original file line number Diff line number Diff line change 1- target =android-16
1+ target =android-19
22proguard.config =${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
33android.library.reference.1 =../library
Original file line number Diff line number Diff line change 1- target =android-21
1+ target =android-19
22android.library =true
Original file line number Diff line number Diff line change 11<manifest xmlns : android =" http://schemas.android.com/apk/res/android" package =" org.wysaid.library" >
2-
3- <application android : allowBackup =" true" android : label =" @string/app_name" >
4- </application >
5-
6- </manifest >
2+ </manifest >
Original file line number Diff line number Diff line change 33# armeabi & mips are deprecated
44APP_ABI := all
55
6- APP_PLATFORM := android-16
6+ APP_PLATFORM := android-19
77
88APP_STL := c++_static
99
Original file line number Diff line number Diff line change 88
99//不可直接在头文件中引用, 否则将对ffmpeg头文件产生较大依赖
1010
11+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
12+
1113extern "C"
1214{
1315#include "libavcodec/avcodec.h"
@@ -17,4 +19,4 @@ extern "C"
1719#include "libavutil/opt.h"
1820#include "libswresample/swresample.h"
1921#include "libswscale/swscale.h"
20- }
22+ }
Original file line number Diff line number Diff line change 22
33if [[ " $NDK_STANDALONE_TOOLCHAIN " == " " ]]; then
44
5- if [[ " $NDK " == " " ]]; then
6- echo " You should set the NDK variable to your ndk-dir!"
7- exit
8- fi
5+ if [[ " $NDK " == " " ]]; then
6+ echo " You should set the NDK variable to your ndk-dir!"
7+ exit
8+ fi
99
10- export NDK_STANDALONE_TOOLCHAIN=$NDK /ndk-build-toolchain
10+ export NDK_STANDALONE_TOOLCHAIN=$NDK /ndk-build-toolchain
1111
12- if [[ ! -d " $NDK_STANDALONE_TOOLCHAIN " ]]; then
12+ if [[ ! -d " $NDK_STANDALONE_TOOLCHAIN " ]]; then
1313
14- $NDK /build/tools/make-standalone-toolchain.sh --toolchain=arm-linux-android-clang3.6 --arch=arm --platform=android-16 --install-dir=$NDK_STANDALONE_TOOLCHAIN --stl=libc++
14+ $NDK /build/tools/make-standalone-toolchain.sh --toolchain=arm-linux-android-clang3.6 --arch=arm --platform=android-19 --install-dir=$NDK_STANDALONE_TOOLCHAIN --stl=libc++
1515
16- fi
16+ fi
1717
1818fi
19- echo " NDK_STANDALONE_TOOLCHAIN=$NDK_STANDALONE_TOOLCHAIN "
19+ echo " NDK_STANDALONE_TOOLCHAIN=$NDK_STANDALONE_TOOLCHAIN "
You can’t perform that action at this time.
0 commit comments