Skip to content

Commit fd55a50

Browse files
committed
less compile warning.
1 parent a995389 commit fd55a50

File tree

6 files changed

+16
-18
lines changed

6 files changed

+16
-18
lines changed

cgeDemo/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
target=android-16
1+
target=android-19
22
proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
33
android.library.reference.1=../library

library/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
target=android-21
1+
target=android-19
22
android.library=true
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
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>

library/src/main/jni/Application.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# armeabi & mips are deprecated
44
APP_ABI := all
55

6-
APP_PLATFORM := android-16
6+
APP_PLATFORM := android-19
77

88
APP_STL := c++_static
99

library/src/main/jni/interface/cgeFFmpegHeaders.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
//不可直接在头文件中引用, 否则将对ffmpeg头文件产生较大依赖
1010

11+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
12+
1113
extern "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+
}

library/src/main/jni/setup_android_toolchain

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
if [[ "$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

1818
fi
19-
echo "NDK_STANDALONE_TOOLCHAIN=$NDK_STANDALONE_TOOLCHAIN"
19+
echo "NDK_STANDALONE_TOOLCHAIN=$NDK_STANDALONE_TOOLCHAIN"

0 commit comments

Comments
 (0)