rename project

gz818 · Jun 7, 2016 · 268154f · 268154f
1 parent b13ee4d
commit 268154f
Show file tree

Hide file tree

Showing 91 changed files with 17 additions and 16 deletions.
diff --git a/IjkplayerLib/build.gradle → IjkLib/build.gradle b/IjkplayerLib/build.gradle → IjkLib/build.gradle
diff --git a/IjkplayerLib/gradle.properties → IjkLib/gradle.properties b/IjkplayerLib/gradle.properties → IjkLib/gradle.properties
diff --git a/IjkplayerLib/proguard-rules.pro → IjkLib/proguard-rules.pro b/IjkplayerLib/proguard-rules.pro → IjkLib/proguard-rules.pro
diff --git a/...angyang/ijkplayerlib/ApplicationTest.java → ...angyang/ijkplayerlib/ApplicationTest.java b/...angyang/ijkplayerlib/ApplicationTest.java → ...angyang/ijkplayerlib/ApplicationTest.java
diff --git a/IjkplayerLib/src/main/AndroidManifest.xml → IjkLib/src/main/AndroidManifest.xml b/IjkplayerLib/src/main/AndroidManifest.xml → IjkLib/src/main/AndroidManifest.xml
diff --git a/...jk/media/services/MediaPlayerService.java → ...jk/media/services/MediaPlayerService.java b/...jk/media/services/MediaPlayerService.java → ...jk/media/services/MediaPlayerService.java
diff --git a/...tv/danmaku/ijk/media/widget/Settings.java → ...tv/danmaku/ijk/media/widget/Settings.java b/...tv/danmaku/ijk/media/widget/Settings.java → ...tv/danmaku/ijk/media/widget/Settings.java
diff --git a/.../widget/media/AndroidMediaController.java → .../widget/media/AndroidMediaController.java b/.../widget/media/AndroidMediaController.java → .../widget/media/AndroidMediaController.java
diff --git a/.../media/widget/media/IMediaController.java → .../media/widget/media/IMediaController.java b/.../media/widget/media/IMediaController.java → .../media/widget/media/IMediaController.java
diff --git a/...u/ijk/media/widget/media/IRenderView.java → ...u/ijk/media/widget/media/IRenderView.java b/...u/ijk/media/widget/media/IRenderView.java → ...u/ijk/media/widget/media/IRenderView.java
diff --git a/.../ijk/media/widget/media/IjkVideoView.java → .../ijk/media/widget/media/IjkVideoView.java b/.../ijk/media/widget/media/IjkVideoView.java → .../ijk/media/widget/media/IjkVideoView.java
diff --git a/...media/widget/media/InfoHudViewHolder.java → ...media/widget/media/InfoHudViewHolder.java b/...media/widget/media/InfoHudViewHolder.java → ...media/widget/media/InfoHudViewHolder.java
diff --git a/...ijk/media/widget/media/MeasureHelper.java → ...ijk/media/widget/media/MeasureHelper.java b/...ijk/media/widget/media/MeasureHelper.java → ...ijk/media/widget/media/MeasureHelper.java
diff --git a/...media/widget/media/MediaPlayerCompat.java → ...media/widget/media/MediaPlayerCompat.java b/...media/widget/media/MediaPlayerCompat.java → ...media/widget/media/MediaPlayerCompat.java
diff --git a/...k/media/widget/media/OutlineTextView.java → ...k/media/widget/media/OutlineTextView.java b/...k/media/widget/media/OutlineTextView.java → ...k/media/widget/media/OutlineTextView.java
diff --git a/...a/widget/media/PlayerMediaController.java → ...a/widget/media/PlayerMediaController.java b/...a/widget/media/PlayerMediaController.java → ...a/widget/media/PlayerMediaController.java
diff --git a/...media/widget/media/SurfaceRenderView.java → ...media/widget/media/SurfaceRenderView.java b/...media/widget/media/SurfaceRenderView.java → ...media/widget/media/SurfaceRenderView.java
diff --git a/...media/widget/media/TableLayoutBinder.java → ...media/widget/media/TableLayoutBinder.java b/...media/widget/media/TableLayoutBinder.java → ...media/widget/media/TableLayoutBinder.java
diff --git a/...media/widget/media/TextureRenderView.java → ...media/widget/media/TextureRenderView.java b/...media/widget/media/TextureRenderView.java → ...media/widget/media/TextureRenderView.java
diff --git a/.../widget/preference/IjkListPreference.java → .../widget/preference/IjkListPreference.java b/.../widget/preference/IjkListPreference.java → .../widget/preference/IjkListPreference.java
diff --git a/.../main/jniLibs/armeabi-v7a/libijkffmpeg.so → .../main/jniLibs/armeabi-v7a/libijkffmpeg.so b/.../main/jniLibs/armeabi-v7a/libijkffmpeg.so → .../main/jniLibs/armeabi-v7a/libijkffmpeg.so
diff --git a/.../main/jniLibs/armeabi-v7a/libijkplayer.so → .../main/jniLibs/armeabi-v7a/libijkplayer.so b/.../main/jniLibs/armeabi-v7a/libijkplayer.so → .../main/jniLibs/armeabi-v7a/libijkplayer.so
diff --git a/...src/main/jniLibs/armeabi-v7a/libijksdl.so → ...src/main/jniLibs/armeabi-v7a/libijksdl.so b/...src/main/jniLibs/armeabi-v7a/libijksdl.so → ...src/main/jniLibs/armeabi-v7a/libijksdl.so
diff --git a/.../src/main/jniLibs/armeabi/libijkffmpeg.so → .../src/main/jniLibs/armeabi/libijkffmpeg.so b/.../src/main/jniLibs/armeabi/libijkffmpeg.so → .../src/main/jniLibs/armeabi/libijkffmpeg.so
diff --git a/.../src/main/jniLibs/armeabi/libijkplayer.so → .../src/main/jniLibs/armeabi/libijkplayer.so b/.../src/main/jniLibs/armeabi/libijkplayer.so → .../src/main/jniLibs/armeabi/libijkplayer.so
diff --git a/...Lib/src/main/jniLibs/armeabi/libijksdl.so → IjkLib/src/main/jniLibs/armeabi/libijksdl.so b/...Lib/src/main/jniLibs/armeabi/libijksdl.so → IjkLib/src/main/jniLibs/armeabi/libijksdl.so
diff --git a/...rLib/src/main/jniLibs/x86/libijkffmpeg.so → IjkLib/src/main/jniLibs/x86/libijkffmpeg.so b/...rLib/src/main/jniLibs/x86/libijkffmpeg.so → IjkLib/src/main/jniLibs/x86/libijkffmpeg.so
diff --git a/...rLib/src/main/jniLibs/x86/libijkplayer.so → IjkLib/src/main/jniLibs/x86/libijkplayer.so b/...rLib/src/main/jniLibs/x86/libijkplayer.so → IjkLib/src/main/jniLibs/x86/libijkplayer.so
diff --git a/...ayerLib/src/main/jniLibs/x86/libijksdl.so → IjkLib/src/main/jniLibs/x86/libijksdl.so b/...ayerLib/src/main/jniLibs/x86/libijksdl.so → IjkLib/src/main/jniLibs/x86/libijksdl.so
diff --git a/...b/src/main/jniLibs/x86_64/libijkffmpeg.so → ...b/src/main/jniLibs/x86_64/libijkffmpeg.so b/...b/src/main/jniLibs/x86_64/libijkffmpeg.so → ...b/src/main/jniLibs/x86_64/libijkffmpeg.so
diff --git a/...b/src/main/jniLibs/x86_64/libijkplayer.so → ...b/src/main/jniLibs/x86_64/libijkplayer.so b/...b/src/main/jniLibs/x86_64/libijkplayer.so → ...b/src/main/jniLibs/x86_64/libijkplayer.so
diff --git a/...rLib/src/main/jniLibs/x86_64/libijksdl.so → IjkLib/src/main/jniLibs/x86_64/libijksdl.so b/...rLib/src/main/jniLibs/x86_64/libijksdl.so → IjkLib/src/main/jniLibs/x86_64/libijksdl.so
diff --git a/...able-hdpi/ic_action_dark_aspect_ratio.png → ...able-hdpi/ic_action_dark_aspect_ratio.png b/...able-hdpi/ic_action_dark_aspect_ratio.png → ...able-hdpi/ic_action_dark_aspect_ratio.png
diff --git a/...s/drawable-hdpi/ic_action_dark_filter.png → ...s/drawable-hdpi/ic_action_dark_filter.png b/...s/drawable-hdpi/ic_action_dark_filter.png → ...s/drawable-hdpi/ic_action_dark_filter.png
diff --git a/...drawable-hdpi/ic_action_dark_settings.png → ...drawable-hdpi/ic_action_dark_settings.png b/...drawable-hdpi/ic_action_dark_settings.png → ...drawable-hdpi/ic_action_dark_settings.png
diff --git a/...es/drawable-hdpi/ic_theme_description.png → ...es/drawable-hdpi/ic_theme_description.png b/...es/drawable-hdpi/ic_theme_description.png → ...es/drawable-hdpi/ic_theme_description.png
diff --git a/...ain/res/drawable-hdpi/ic_theme_folder.png → ...ain/res/drawable-hdpi/ic_theme_folder.png b/...ain/res/drawable-hdpi/ic_theme_folder.png → ...ain/res/drawable-hdpi/ic_theme_folder.png
diff --git a/...res/drawable-hdpi/ic_theme_play_arrow.png → ...res/drawable-hdpi/ic_theme_play_arrow.png b/...res/drawable-hdpi/ic_theme_play_arrow.png → ...res/drawable-hdpi/ic_theme_play_arrow.png
diff --git a/...able-mdpi/ic_action_dark_aspect_ratio.png → ...able-mdpi/ic_action_dark_aspect_ratio.png b/...able-mdpi/ic_action_dark_aspect_ratio.png → ...able-mdpi/ic_action_dark_aspect_ratio.png
diff --git a/...s/drawable-mdpi/ic_action_dark_filter.png → ...s/drawable-mdpi/ic_action_dark_filter.png b/...s/drawable-mdpi/ic_action_dark_filter.png → ...s/drawable-mdpi/ic_action_dark_filter.png
diff --git a/...drawable-mdpi/ic_action_dark_settings.png → ...drawable-mdpi/ic_action_dark_settings.png b/...drawable-mdpi/ic_action_dark_settings.png → ...drawable-mdpi/ic_action_dark_settings.png
diff --git a/...es/drawable-mdpi/ic_theme_description.png → ...es/drawable-mdpi/ic_theme_description.png b/...es/drawable-mdpi/ic_theme_description.png → ...es/drawable-mdpi/ic_theme_description.png
diff --git a/...ain/res/drawable-mdpi/ic_theme_folder.png → ...ain/res/drawable-mdpi/ic_theme_folder.png b/...ain/res/drawable-mdpi/ic_theme_folder.png → ...ain/res/drawable-mdpi/ic_theme_folder.png
diff --git a/...res/drawable-mdpi/ic_theme_play_arrow.png → ...res/drawable-mdpi/ic_theme_play_arrow.png b/...res/drawable-mdpi/ic_theme_play_arrow.png → ...res/drawable-mdpi/ic_theme_play_arrow.png
diff --git a/...ble-xhdpi/ic_action_dark_aspect_ratio.png → ...ble-xhdpi/ic_action_dark_aspect_ratio.png b/...ble-xhdpi/ic_action_dark_aspect_ratio.png → ...ble-xhdpi/ic_action_dark_aspect_ratio.png
diff --git a/.../drawable-xhdpi/ic_action_dark_filter.png → .../drawable-xhdpi/ic_action_dark_filter.png b/.../drawable-xhdpi/ic_action_dark_filter.png → .../drawable-xhdpi/ic_action_dark_filter.png
diff --git a/...rawable-xhdpi/ic_action_dark_settings.png → ...rawable-xhdpi/ic_action_dark_settings.png b/...rawable-xhdpi/ic_action_dark_settings.png → ...rawable-xhdpi/ic_action_dark_settings.png
diff --git a/...s/drawable-xhdpi/ic_theme_description.png → ...s/drawable-xhdpi/ic_theme_description.png b/...s/drawable-xhdpi/ic_theme_description.png → ...s/drawable-xhdpi/ic_theme_description.png
diff --git a/...in/res/drawable-xhdpi/ic_theme_folder.png → ...in/res/drawable-xhdpi/ic_theme_folder.png b/...in/res/drawable-xhdpi/ic_theme_folder.png → ...in/res/drawable-xhdpi/ic_theme_folder.png
diff --git a/...es/drawable-xhdpi/ic_theme_play_arrow.png → ...es/drawable-xhdpi/ic_theme_play_arrow.png b/...es/drawable-xhdpi/ic_theme_play_arrow.png → ...es/drawable-xhdpi/ic_theme_play_arrow.png
diff --git a/...le-xxhdpi/ic_action_dark_aspect_ratio.png → ...le-xxhdpi/ic_action_dark_aspect_ratio.png b/...le-xxhdpi/ic_action_dark_aspect_ratio.png → ...le-xxhdpi/ic_action_dark_aspect_ratio.png
diff --git a/...drawable-xxhdpi/ic_action_dark_filter.png → ...drawable-xxhdpi/ic_action_dark_filter.png b/...drawable-xxhdpi/ic_action_dark_filter.png → ...drawable-xxhdpi/ic_action_dark_filter.png
diff --git a/...awable-xxhdpi/ic_action_dark_settings.png → ...awable-xxhdpi/ic_action_dark_settings.png b/...awable-xxhdpi/ic_action_dark_settings.png → ...awable-xxhdpi/ic_action_dark_settings.png
diff --git a/.../drawable-xxhdpi/ic_theme_description.png → .../drawable-xxhdpi/ic_theme_description.png b/.../drawable-xxhdpi/ic_theme_description.png → .../drawable-xxhdpi/ic_theme_description.png
diff --git a/...n/res/drawable-xxhdpi/ic_theme_folder.png → ...n/res/drawable-xxhdpi/ic_theme_folder.png b/...n/res/drawable-xxhdpi/ic_theme_folder.png → ...n/res/drawable-xxhdpi/ic_theme_folder.png
diff --git a/...s/drawable-xxhdpi/ic_theme_play_arrow.png → ...s/drawable-xxhdpi/ic_theme_play_arrow.png b/...s/drawable-xxhdpi/ic_theme_play_arrow.png → ...s/drawable-xxhdpi/ic_theme_play_arrow.png
diff --git a/...n/res/drawable-xxhdpi/live_room_audio.png → ...n/res/drawable-xxhdpi/live_room_audio.png b/...n/res/drawable-xxhdpi/live_room_audio.png → ...n/res/drawable-xxhdpi/live_room_audio.png
diff --git a/...wable-xxhdpi/live_room_seek_bar_point.png → ...wable-xxhdpi/live_room_seek_bar_point.png b/...wable-xxhdpi/live_room_seek_bar_point.png → ...wable-xxhdpi/live_room_seek_bar_point.png
diff --git a/...xxhdpi/scrubber_control_disabled_holo.png → ...xxhdpi/scrubber_control_disabled_holo.png b/...xxhdpi/scrubber_control_disabled_holo.png → ...xxhdpi/scrubber_control_disabled_holo.png
diff --git a/...-xxhdpi/scrubber_control_focused_holo.png → ...-xxhdpi/scrubber_control_focused_holo.png b/...-xxhdpi/scrubber_control_focused_holo.png → ...-xxhdpi/scrubber_control_focused_holo.png
diff --git a/...e-xxhdpi/scrubber_control_normal_holo.png → ...e-xxhdpi/scrubber_control_normal_holo.png b/...e-xxhdpi/scrubber_control_normal_holo.png → ...e-xxhdpi/scrubber_control_normal_holo.png
diff --git a/...-xxhdpi/scrubber_control_pressed_holo.png → ...-xxhdpi/scrubber_control_pressed_holo.png b/...-xxhdpi/scrubber_control_pressed_holo.png → ...-xxhdpi/scrubber_control_pressed_holo.png
diff --git a/...awable-xxhdpi/scrubber_primary_holo.9.png → ...awable-xxhdpi/scrubber_primary_holo.9.png b/...awable-xxhdpi/scrubber_primary_holo.9.png → ...awable-xxhdpi/scrubber_primary_holo.9.png
diff --git a/...able-xxhdpi/scrubber_secondary_holo.9.png → ...able-xxhdpi/scrubber_secondary_holo.9.png b/...able-xxhdpi/scrubber_secondary_holo.9.png → ...able-xxhdpi/scrubber_secondary_holo.9.png
diff --git a/...ble-xxhdpi/scrubber_track_holo_dark.9.png → ...ble-xxhdpi/scrubber_track_holo_dark.9.png b/...ble-xxhdpi/scrubber_track_holo_dark.9.png → ...ble-xxhdpi/scrubber_track_holo_dark.9.png
diff --git a/...e-xxxhdpi/ic_action_dark_aspect_ratio.png → ...e-xxxhdpi/ic_action_dark_aspect_ratio.png b/...e-xxxhdpi/ic_action_dark_aspect_ratio.png → ...e-xxxhdpi/ic_action_dark_aspect_ratio.png
diff --git a/...rawable-xxxhdpi/ic_action_dark_filter.png → ...rawable-xxxhdpi/ic_action_dark_filter.png b/...rawable-xxxhdpi/ic_action_dark_filter.png → ...rawable-xxxhdpi/ic_action_dark_filter.png
diff --git a/...wable-xxxhdpi/ic_action_dark_settings.png → ...wable-xxxhdpi/ic_action_dark_settings.png b/...wable-xxxhdpi/ic_action_dark_settings.png → ...wable-xxxhdpi/ic_action_dark_settings.png
diff --git a/...drawable-xxxhdpi/ic_theme_description.png → ...drawable-xxxhdpi/ic_theme_description.png b/...drawable-xxxhdpi/ic_theme_description.png → ...drawable-xxxhdpi/ic_theme_description.png
diff --git a/.../res/drawable-xxxhdpi/ic_theme_folder.png → .../res/drawable-xxxhdpi/ic_theme_folder.png b/.../res/drawable-xxxhdpi/ic_theme_folder.png → .../res/drawable-xxxhdpi/ic_theme_folder.png
diff --git a/.../drawable-xxxhdpi/ic_theme_play_arrow.png → .../drawable-xxxhdpi/ic_theme_play_arrow.png b/.../drawable-xxxhdpi/ic_theme_play_arrow.png → .../drawable-xxxhdpi/ic_theme_play_arrow.png
diff --git a/...awable/scrubber_control_selector_holo.xml → ...awable/scrubber_control_selector_holo.xml b/...awable/scrubber_control_selector_holo.xml → ...awable/scrubber_control_selector_holo.xml
diff --git a/...crubber_progress_horizontal_holo_dark.xml → ...crubber_progress_horizontal_holo_dark.xml b/...crubber_progress_horizontal_holo_dark.xml → ...crubber_progress_horizontal_holo_dark.xml
diff --git a/...src/main/res/layout/ijk_media_control.xml → ...src/main/res/layout/ijk_media_control.xml b/...src/main/res/layout/ijk_media_control.xml → ...src/main/res/layout/ijk_media_control.xml
diff --git a/.../src/main/res/layout/table_media_info.xml → .../src/main/res/layout/table_media_info.xml b/.../src/main/res/layout/table_media_info.xml → .../src/main/res/layout/table_media_info.xml
diff --git a/...main/res/layout/table_media_info_row1.xml → ...main/res/layout/table_media_info_row1.xml b/...main/res/layout/table_media_info_row1.xml → ...main/res/layout/table_media_info_row1.xml
diff --git a/...main/res/layout/table_media_info_row2.xml → ...main/res/layout/table_media_info_row2.xml b/...main/res/layout/table_media_info_row2.xml → ...main/res/layout/table_media_info_row2.xml
diff --git a/...n/res/layout/table_media_info_section.xml → ...n/res/layout/table_media_info_section.xml b/...n/res/layout/table_media_info_section.xml → ...n/res/layout/table_media_info_section.xml
diff --git a/IjkplayerLib/src/main/res/values/attrs.xml → IjkLib/src/main/res/values/attrs.xml b/IjkplayerLib/src/main/res/values/attrs.xml → IjkLib/src/main/res/values/attrs.xml
diff --git a/IjkplayerLib/src/main/res/values/colors.xml → IjkLib/src/main/res/values/colors.xml b/IjkplayerLib/src/main/res/values/colors.xml → IjkLib/src/main/res/values/colors.xml
diff --git a/IjkplayerLib/src/main/res/values/dimens.xml → IjkLib/src/main/res/values/dimens.xml b/IjkplayerLib/src/main/res/values/dimens.xml → IjkLib/src/main/res/values/dimens.xml
diff --git a/IjkplayerLib/src/main/res/values/ids.xml → IjkLib/src/main/res/values/ids.xml b/IjkplayerLib/src/main/res/values/ids.xml → IjkLib/src/main/res/values/ids.xml
diff --git a/IjkplayerLib/src/main/res/values/strings.xml → IjkLib/src/main/res/values/strings.xml b/IjkplayerLib/src/main/res/values/strings.xml → IjkLib/src/main/res/values/strings.xml
diff --git a/...rLib/src/main/res/values/strings_pref.xml → IjkLib/src/main/res/values/strings_pref.xml b/...rLib/src/main/res/values/strings_pref.xml → IjkLib/src/main/res/values/strings_pref.xml
diff --git a/IjkplayerLib/src/main/res/values/styles.xml → IjkLib/src/main/res/values/styles.xml b/IjkplayerLib/src/main/res/values/styles.xml → IjkLib/src/main/res/values/styles.xml
diff --git a/IjkplayerLib/src/main/res/xml/settings.xml → IjkLib/src/main/res/xml/settings.xml b/IjkplayerLib/src/main/res/xml/settings.xml → IjkLib/src/main/res/xml/settings.xml
diff --git a/build.gradle b/build.gradle
@@ -9,6 +9,9 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Jun 07 18:06:37 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -22,5 +22,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.2.1'
-    compile project(':IjkplayerLib')
+    compile project(':IjkLib')
 }
diff --git a/sample/sample.iml b/sample/sample.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":sample" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="IjkplayerLib" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":sample" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.leifzhang" external.system.module.version="0.0.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -64,14 +64,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -102,8 +102,6 @@
     <orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-23.2.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.2.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="module" module-name="IjkplayerLib-IjkplayerLib" exported="" />
+    <orderEntry type="module" module-name="IjkLib" exported="" />
   </component>
 </module>
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':sample', ':IjkplayerLib'
+include ':sample', ':IjkLib'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':sample', ':IjkplayerLib'
		include ':sample', ':IjkLib'