Separating source for Android Studio/Gradle and Eclipse/ant to avoid confusing ant.

Author: iiordanov

bVNC/.classpath

@@ -4,10 +4,10 @@
 	<classpathentry kind="lib" path="libs/com.antlersoft.android.db.jar" sourcepath="/home/mike/src/eclipse-workspaces/android/dbimpl/src"/>
 	<classpathentry kind="lib" path="libs/com.antlersoft.android.contentxml.jar" sourcepath="/dbimpl/src"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/PubkeyGenerator"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/FreeRDPCore"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

bVNC/AndroidManifest.xml.bVNC

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.bVNC" android:installLocation="auto"
-    android:versionCode="3976" android:versionName="v3.9.7">
+    android:versionCode="3980" android:versionName="v3.9.8">
 
     <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="21"></uses-sdk>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>

bVNC/assets

@@ -1 +1 @@
-src/main/assets/
+src2/main/assets/

bVNC/build.gradle

@@ -16,6 +16,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+    sourceSets {
+        main.java.srcDirs = 'src2/main/'
+    }
 }
 
 dependencies {

bVNC/libs/sqlcipher-javadoc.jar

@@ -11,6 +11,6 @@
 split.density=false
 # Project target.
 target=android-25
-android.library.reference.1=../PubkeyGenerator
-android.library.reference.2=../../../../android-sdk-linux/extras/android/support/v7/appcompat
-android.library.reference.3=../FreeRDP/client/Android/Studio/freeRDPCore/src/main
+android.library.reference.1=../../../android-sdk-linux/extras/android/support/v7/appcompat
+android.library.reference.2=../Opaque/jni/libs/deps/FreeRDP/client/Android/Studio/freeRDPCore/src/main
+android.library.reference.3=../pubkeyGenerator

bVNC/libs/sqlcipher.jar

@@ -1 +1 @@
-src/main/res/
+src2/main/res/

bVNC/project.properties

@@ -1 +1 @@
-main/java/com/
+../src2/main/java/com

bVNC/res

@@ -1 +1 @@
-main/java/org/
+../src2/main/java/org/