From 319e1faf3ba0cb740704db4eb048c541f577e733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 20 May 2014 17:00:46 +0200 Subject: [PATCH] Add zipsigner as a submodule --- .gitmodules | 4 ++++ build.gradle | 1 + extern/ant-src/kellinwood | 1 + extern/zipsigner | 1 + project.properties | 3 +++ settings.gradle | 12 ++++++------ 6 files changed, 16 insertions(+), 6 deletions(-) create mode 120000 extern/ant-src/kellinwood create mode 160000 extern/zipsigner diff --git a/.gitmodules b/.gitmodules index 1cd325a0d..df6c6537e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,3 +26,7 @@ path = extern/Support url = https://android.googlesource.com/platform/frameworks/support ignore = dirty +[submodule "extern/zipsigner"] + path = extern/zipsigner + url = https://gitlab.com/fdroid/zipsigner.git + ignore = dirty diff --git a/build.gradle b/build.gradle index 058e683ec..2616186a4 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,7 @@ dependencies { compile project(':extern:MemorizingTrustManager') compile project(':extern:libsuperuser:libsuperuser') compile project(':extern:nanohttpd:core') + compile project(':extern:zipsigner') } project(':extern:UniversalImageLoader:library') { diff --git a/extern/ant-src/kellinwood b/extern/ant-src/kellinwood new file mode 120000 index 000000000..443258ed6 --- /dev/null +++ b/extern/ant-src/kellinwood @@ -0,0 +1 @@ +../zipsigner/src/main/java/kellinwood \ No newline at end of file diff --git a/extern/zipsigner b/extern/zipsigner new file mode 160000 index 000000000..cec7027b6 --- /dev/null +++ b/extern/zipsigner @@ -0,0 +1 @@ +Subproject commit cec7027b69941c0f5d789421fa5fa5ebdbea08f8 diff --git a/project.properties b/project.properties index 734459ba3..fa8f55849 100644 --- a/project.properties +++ b/project.properties @@ -8,3 +8,6 @@ android.library.reference.3=extern/AndroidPinning android.library.reference.4=extern/nanohttpd/core android.library.reference.5=extern/libsuperuser/libsuperuser android.library.reference.6=extern/jmdns + +# For java libraries, place symlinks in extern/ant-src +source.dir=src;extern/ant-src diff --git a/settings.gradle b/settings.gradle index b4af236dd..550af854e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ -include \ - ':extern:AndroidPinning', - ':extern:UniversalImageLoader:library', - ':extern:MemorizingTrustManager', - ':extern:libsuperuser:libsuperuser', - ':extern:nanohttpd:core' +include ':extern:AndroidPinning' +include ':extern:UniversalImageLoader:library' +include ':extern:MemorizingTrustManager' +include ':extern:libsuperuser:libsuperuser' +include ':extern:nanohttpd:core' +include ':extern:zipsigner' include ':support-v4' project(':support-v4').projectDir = new File('extern/Support/v4')