Commit 423552f4de6ac97cd07b6bae348eae546bba31cb
1 parent
82764fae
升级推流SDk
Showing
22 changed files
with
6 additions
and
6 deletions
.idea/gradle.xml
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | <GradleProjectSettings> |
| 6 | 6 | <option name="distributionType" value="LOCAL" /> |
| 7 | 7 | <option name="externalProjectPath" value="$PROJECT_DIR$" /> |
| 8 | - <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" /> | |
| 8 | + <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-3.3" /> | |
| 9 | 9 | <option name="modules"> |
| 10 | 10 | <set> |
| 11 | 11 | <option value="$PROJECT_DIR$" /> | ... | ... |
.idea/misc.xml
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 | <ConfirmationsSetting value="0" id="Add" /> |
| 38 | 38 | <ConfirmationsSetting value="0" id="Remove" /> |
| 39 | 39 | </component> |
| 40 | - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| 40 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| 41 | 41 | <output url="file://$PROJECT_DIR$/build/classes" /> |
| 42 | 42 | </component> |
| 43 | 43 | <component name="ProjectType"> | ... | ... |
app/build.gradle
app/libs/libcnlivestream.jar
No preview for this file type
app/src/main/jniLibs/arm64-v8a/libpldroid_mmprocessing.so
No preview for this file type
app/src/main/jniLibs/arm64-v8a/libpldroid_streaming_aac_encoder.so
No preview for this file type
app/src/main/jniLibs/arm64-v8a/libpldroid_streaming_core.so
No preview for this file type
app/src/main/jniLibs/arm64-v8a/libpldroid_streaming_h264_encoder.so
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libpldroid_mmprocessing.so
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libpldroid_streaming_aac_encoder.so
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libpldroid_streaming_core.so
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libpldroid_streaming_h264_encoder.so
No preview for this file type
app/src/main/jniLibs/armeabi/libpldroid_mmprocessing.so
No preview for this file type
app/src/main/jniLibs/armeabi/libpldroid_streaming_aac_encoder.so
No preview for this file type
app/src/main/jniLibs/armeabi/libpldroid_streaming_core.so
No preview for this file type
app/src/main/jniLibs/armeabi/libpldroid_streaming_h264_encoder.so
No preview for this file type
app/src/main/jniLibs/x86/libpldroid_mmprocessing.so
No preview for this file type
app/src/main/jniLibs/x86/libpldroid_streaming_aac_encoder.so
No preview for this file type
app/src/main/jniLibs/x86/libpldroid_streaming_core.so
No preview for this file type
app/src/main/jniLibs/x86/libpldroid_streaming_h264_encoder.so
No preview for this file type
build.gradle
| ... | ... | @@ -5,7 +5,7 @@ buildscript { |
| 5 | 5 | jcenter() |
| 6 | 6 | } |
| 7 | 7 | dependencies { |
| 8 | - classpath 'com.android.tools.build:gradle:2.2.2' | |
| 8 | + classpath 'com.android.tools.build:gradle:2.3.0' | |
| 9 | 9 | |
| 10 | 10 | // NOTE: Do not place your application dependencies here; they belong |
| 11 | 11 | // in the individual module build.gradle files | ... | ... |
gradle/wrapper/gradle-wrapper.properties
| 1 | -#Mon Dec 28 10:00:20 PST 2015 | |
| 1 | +#Wed Mar 08 10:31:51 CST 2017 | |
| 2 | 2 | distributionBase=GRADLE_USER_HOME |
| 3 | 3 | distributionPath=wrapper/dists |
| 4 | 4 | zipStoreBase=GRADLE_USER_HOME |
| 5 | 5 | zipStorePath=wrapper/dists |
| 6 | -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip | |
| 6 | +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip | ... | ... |