Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat...

[pub/Android/ownCloud.git] / setup_env.sh

diff --git a/setup_env.sh b/setup_env.sh
index 78babf1..b13fe81 100755 (executable)
--- a/setup_env.sh
+++ b/setup_env.sh
@@ -2,8 +2,9 @@
 
 git submodule init
 git submodule update
 
 git submodule init
 git submodule update

-android update project -p actionbarsherlock/library
+android update project -p actionbarsherlock/library -n ActionBarSherlock
+android update project -p oc_framework -n ownCloudFramework

 android update project -p .
 android update project -p .

+android update project -p oc_jb_workaround

 cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar 
 cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar 

-cd tests
-android update test-project -m .. -p .
+android update test-project -p tests -m ..