From 732fb87944b24b2c940d8a598b042afb3e118414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 26 Apr 2014 02:40:08 +0200 Subject: [PATCH] Add libsuperuser as external git submodule and project dependency --- .gitmodules | 4 ++++ ant-prepare.sh | 1 + build.gradle | 1 + extern/libsuperuser | 1 + project.properties | 1 + settings.gradle | 2 +- 6 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 extern/libsuperuser diff --git a/.gitmodules b/.gitmodules index b54d0200a..3b769a41a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,7 @@ path = extern/AndroidPinning url = https://github.com/binaryparadox/AndroidPinning.git ignore = dirty +[submodule "extern/libsuperuser"] + path = extern/libsuperuser + url = https://github.com/dschuermann/libsuperuser.git + ignore = dirty diff --git a/ant-prepare.sh b/ant-prepare.sh index 299d005e9..3752c823e 100755 --- a/ant-prepare.sh +++ b/ant-prepare.sh @@ -3,6 +3,7 @@ android update lib-project --path extern/UniversalImageLoader/library android update lib-project --path extern/AndroidPinning android update lib-project --path extern/MemorizingTrustManager +android update lib-project --path extern/libsuperuser/libsuperuser android update project --path . --name F-Droid # technically optional, needed for the tests diff --git a/build.gradle b/build.gradle index e15c643a0..d70eda598 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,7 @@ dependencies { compile project(':extern:AndroidPinning') compile project(':extern:UniversalImageLoader:library') compile project(':extern:MemorizingTrustManager') + compile project(':extern:libsuperuser:libsuperuser') } project(':extern:UniversalImageLoader:library') { diff --git a/extern/libsuperuser b/extern/libsuperuser new file mode 160000 index 000000000..faffc4112 --- /dev/null +++ b/extern/libsuperuser @@ -0,0 +1 @@ +Subproject commit faffc41121b509b2b1b01d4ecac3f395e4adbee2 diff --git a/project.properties b/project.properties index d6e5f072f..ae8e81427 100644 --- a/project.properties +++ b/project.properties @@ -5,3 +5,4 @@ target=android-19 android.library.reference.1=extern/UniversalImageLoader/library android.library.reference.2=extern/MemorizingTrustManager android.library.reference.3=extern/AndroidPinning +android.library.reference.4=extern/libsuperuser/libsuperuser diff --git a/settings.gradle b/settings.gradle index 66e6ee88a..ed61ad01d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':extern:AndroidPinning', ':extern:UniversalImageLoader:library', ':extern:MemorizingTrustManager' +include ':extern:AndroidPinning', ':extern:UniversalImageLoader:library', ':extern:MemorizingTrustManager', ':extern:libsuperuser:libsuperuser'