checkout dev (2017-11-15)

gsyVideoPlayer/build.gradle

@@ -31,7 +31,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    //compile project(':gsyVideoPlayer-java')
+    compile project(':gsyVideoPlayer-java')
     //compile project(':gsyVideoPlayer-armv5')
     //compile project(':gsyVideoPlayer-armv7a')
     //compile project(':gsyVideoPlayer-armv64')
@@ -41,7 +41,7 @@ dependencies {
     //更多配置版so，增加了concat,rtsp,mpeg，crypto
     //compile project(':gsyVideoPlayer-ex_so')
 
-    compile "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
+    //compile "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
 
     compile "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"
     compile "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"