升级推流SDk

王琳
1 parent 82764fae
Showing 22 changed files with 6 additions and 6 deletions
.idea/gradle.xml
.idea/misc.xml
app/build.gradle
app/libs/libcnlivestream.jar
app/src/main/jniLibs/arm64-v8a/libpldroid_mmprocessing.so
app/src/main/jniLibs/arm64-v8a/libpldroid_streaming_aac_encoder.so
app/src/main/jniLibs/arm64-v8a/libpldroid_streaming_core.so
app/src/main/jniLibs/arm64-v8a/libpldroid_streaming_h264_encoder.so
app/src/main/jniLibs/armeabi-v7a/libpldroid_mmprocessing.so
app/src/main/jniLibs/armeabi-v7a/libpldroid_streaming_aac_encoder.so
app/src/main/jniLibs/armeabi-v7a/libpldroid_streaming_core.so
app/src/main/jniLibs/armeabi-v7a/libpldroid_streaming_h264_encoder.so
app/src/main/jniLibs/armeabi/libpldroid_mmprocessing.so
app/src/main/jniLibs/armeabi/libpldroid_streaming_aac_encoder.so
app/src/main/jniLibs/armeabi/libpldroid_streaming_core.so
app/src/main/jniLibs/armeabi/libpldroid_streaming_h264_encoder.so
app/src/main/jniLibs/x86/libpldroid_mmprocessing.so
app/src/main/jniLibs/x86/libpldroid_streaming_aac_encoder.so
app/src/main/jniLibs/x86/libpldroid_streaming_core.so
app/src/main/jniLibs/x86/libpldroid_streaming_h264_encoder.so
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-3.3" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <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">
+  <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">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -2,7 +2,7 @@ apply plugin: &#39;com.android.application&#39;
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    buildToolsVersion '25.0.0'
     defaultConfig {
         applicationId "com.cnlive.demo.streamqn"
         minSdkVersion 16
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Mar 08 10:31:51 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip