Merge pull request #87 from dschuermann/development

Daniel Gultsch created 11 years ago

Use git submodule with openpgp-api-lib only

Change summary

.gitmodules           | 6 +++---
libs/openpgp-api-lib  | 1 +
libs/openpgp-keychain | 1 -
project.properties    | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)

Detailed changes

.gitmodules

@@ -1,7 +1,7 @@
-[submodule "libs/openpgp-keychain"]
-	path = libs/openpgp-keychain
-	url = https://github.com/openpgp-keychain/openpgp-keychain.git
 [submodule "libs/minidns"]
 	path = libs/minidns
 	url = https://github.com/rtreffer/minidns.git
 
+[submodule "libs/openpgp-api-lib"]
+	path = libs/openpgp-api-lib
+	url = https://github.com/open-keychain/openpgp-api-lib.git

libs/openpgp-api-lib

@@ -0,0 +1 @@
+Subproject commit 650e1ebda82596cd4fbfaae406e6eccf189f4f63

libs/openpgp-keychain

@@ -1 +0,0 @@
-Subproject commit e0a0bf04ee6fa4794a82b44dae905bc814d85491

project.properties

@@ -13,4 +13,4 @@
 # Project target.
 target=android-19
 android.library.reference.1=libs/minidns
-android.library.reference.2=libs/openpgp-keychain/OpenKeychain-API/libraries/openpgp-api-library
+android.library.reference.2=libs/openpgp-api-lib