[android-platform-tools-base] 03/08: Add libhttpcore-java-ThreadSafe.patch.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository android-platform-tools-base.

commit 6b42d086eab87f40411b2756ab15f2dc353515e7
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jul 13 21:27:26 2016 +0200

    Add libhttpcore-java-ThreadSafe.patch.
    
    Replace removed ThreadSafe annotation class with custom built annotations.
    
    Closes: #828813
    Thanks: Chris Lamb for the report.
---
 debian/patches/libhttpcore-java-ThreadSafe.patch | 36 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/libhttpcore-java-ThreadSafe.patch b/debian/patches/libhttpcore-java-ThreadSafe.patch
new file mode 100644
index 0000000..5804831
--- /dev/null
+++ b/debian/patches/libhttpcore-java-ThreadSafe.patch
@@ -0,0 +1,36 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 13 Jul 2016 21:25:14 +0200
+Subject: libhttpcore-java ThreadSafe
+
+The ThreadSafe annotation class was removed from libhttpcore-java in version
+4.4.5. This patch fixes the issue.
+
+Debian-Bug: https://bugs.debian.org/828813
+Forwarded: no
+---
+ .../main/java/com/android/builder/core/DefaultManifestParser.java    | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/base/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java b/base/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java
+index 0d1f9f1..8c714a8 100644
+--- a/base/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java
++++ b/base/build-system/builder/src/main/java/com/android/builder/core/DefaultManifestParser.java
+@@ -25,7 +25,8 @@ import com.android.xml.AndroidManifest;
+ import com.android.xml.AndroidXPathFactory;
+ import com.google.common.base.Optional;
+ 
+-import org.apache.http.annotation.ThreadSafe;
++import org.apache.http.annotation.ThreadingBehavior;
++import org.apache.http.annotation.Contract;
+ import org.xml.sax.InputSource;
+ 
+ import java.io.File;
+@@ -34,7 +35,7 @@ import java.io.IOException;
+ import javax.xml.xpath.XPath;
+ import javax.xml.xpath.XPathExpressionException;
+ 
+- at ThreadSafe
++ at Contract(threading = ThreadingBehavior.SAFE)
+ class DefaultManifestParser implements ManifestParser {
+ 
+     Optional<Object> mMinSdkVersion;
diff --git a/debian/patches/series b/debian/patches/series
index 5a9f2c3..b35733a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ gradle-experimental.patch
 SdkTestCase.patch
 project-test-lib.patch
 trove3.patch
+libhttpcore-java-ThreadSafe.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git