Moved musicbrainz-android submodule inside of PicardBarcodeScanner mo…

…dule to avoid Android gradle problems.

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "musicbrainz-android"]
-	path = musicbrainz-android
+[submodule "PicardBarcodeScanner/src/musicbrainz-android"]
+	path = PicardBarcodeScanner/src/musicbrainz-android
 	url = https://github.com/jdamcd/musicbrainz-android.git

PicardBarcodeScanner/PicardBarcodeScanner.iml

@@ -44,6 +44,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/musicbrainz-android/api/src/main/java" isTestSource="false" />
       <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/res" isTestSource="false" />
@@ -71,7 +72,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="support-v4-18.0.0" level="project" />
     <orderEntry type="library" exported="" name="ComAndroidSupportAppcompatV71800.aar" level="project" />
-    <orderEntry type="module" module-name="PicardBarcodeScannerProject" />
   </component>
 </module>
 

PicardBarcodeScanner/build.gradle

@@ -22,7 +22,7 @@ android {
     }
 }
 
-android.sourceSets.main.java.srcDirs '../musicbrainz-android/api/src/main/java/'
+android.sourceSets.main.java.srcDirs 'src/musicbrainz-android/api/src/main/java/'
 
 dependencies {
     compile 'com.android.support:support-v4:18.0.0'

PicardBarcodeScannerProject.iml

@@ -3,7 +3,6 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/musicbrainz-android/api/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>