diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 23:06:32 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-26 23:06:32 +0200 |
| commit | 8132b9ac745f6eedd4a7746f1e67358a61e9e4a7 (patch) | |
| tree | f1c8c520a449f3ef306e1e1e7e2b1bc70a3240ad /README.md | |
| parent | d8f278229352a58dbdcf49bb65538249f8c4ccc0 (diff) | |
| parent | 45722d7cfbb2996ff994b3f2143e5871c2e564ba (diff) | |
| download | open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.tar.gz open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.tar.bz2 open-keychain-8132b9ac745f6eedd4a7746f1e67358a61e9e4a7.zip | |
Merge branch 'master' into ditch-appmsg
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -40,6 +40,11 @@ Select everything for the newest SDK Platform (API-Level 19) 5. Execute ``./gradlew build`` 6. You can install the app with ``adb install -r OpenKeychain/build/outputs/apk/OpenKeychain-debug-unaligned.apk`` +### Run Tests +1. Use OpenJDK instead of Oracle JDK +2. Execute ``./prepare-tests.sh`` +3. Execute ``./gradlew build`` + ### Build API Demo with Gradle 1. Follow 1-4 from above @@ -48,13 +53,10 @@ Select everything for the newest SDK Platform (API-Level 19) ### Development with Android Studio -I am using the newest [Android Studio](http://developer.android.com/sdk/installing/studio.html) for development. Development with Eclipse is currently not possible because I am using the new [project structure](http://developer.android.com/sdk/installing/studio-tips.html). +We are using the newest [Android Studio](http://developer.android.com/sdk/installing/studio.html) for development. Development with Eclipse is currently not possible because we are using the new [project structure](http://developer.android.com/sdk/installing/studio-tips.html). -1. Clone the project from github -2. From Android Studio: File -> Import Project -> ... - * Select the cloned top folder if you want to develop on the main project - * Select the "OpenKeychain-API" folder if you want to develop on the API example -3. Import project from external model -> choose Gradle +1. Clone the project from Github +2. From Android Studio: File -> Import Project -> Select the cloned top folder ## OpenKeychain's API |