11 files changed, 13 insertions, 0 deletions
diff --git a/libraries/keychain-api-library/src/main/AndroidManifest.xml b/libraries/keychain-api-library/AndroidManifest.xml
index 768922c22..768922c22 100644
--- a/libraries/keychain-api-library/src/main/AndroidManifest.xml
+++ b/libraries/keychain-api-library/AndroidManifest.xml
diff --git a/libraries/keychain-api-library/build.gradle b/libraries/keychain-api-library/build.gradle
index f9da72cb8..0c8668332 100644
--- a/libraries/keychain-api-library/build.gradle
+++ b/libraries/keychain-api-library/build.gradle
@@ -15,6 +15,19 @@ android {
     compileSdkVersion 19
     buildToolsVersion '19.0.1'
     
+    // NOTE: We are using the old folder structure to also support Eclipse
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['src']
+            aidl.srcDirs = ['src']
+            renderscript.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+    
     // Do not abort build if lint finds errors
     lintOptions {
         abortOnError false
diff --git a/libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl b/libraries/keychain-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl
index 578a7d4b5..578a7d4b5 100644
--- a/libraries/keychain-api-library/src/main/aidl/org/openintents/openpgp/IOpenPgpService.aidl
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpError.java b/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpError.java
index 4dd2cc641..4dd2cc641 100644
--- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpError.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpError.java
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java b/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java
index 16c79ca27..16c79ca27 100644
--- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/OpenPgpSignatureResult.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java
index f121c345d..f121c345d 100644
--- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpConstants.java
index 263b42aaa..263b42aaa 100644
--- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpConstants.java
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpListPreference.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
index e29794e87..e29794e87 100644
--- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpListPreference.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java
index 8e8812faa..8e8812faa 100644
--- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpServiceConnection.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpUtils.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java
index ffecaceba..ffecaceba 100644
--- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpUtils.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java
index 75d4b8c18..75d4b8c18 100644
--- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java