patched_tools.diff

 modules/packages/manifests/android-sdk18-debian/changelog |  2 +-
 modules/packages/manifests/android-sdk18-debian/rules     | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/packages/manifests/android-sdk18-debian/changelog b/modules/packages/manifests/android-sdk18-debian/changelog
index 703cc7c..e08c25a 100644
--- a/modules/packages/manifests/android-sdk18-debian/changelog
+++ b/modules/packages/manifests/android-sdk18-debian/changelog
@@ -1,12 +1,12 @@
 android-sdk18 (0.r18-0moz2) precise; urgency=low
 
   * 0.r18 (stable) release
-  * Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=933918 
+  * Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=933918
 
  -- Armen Zambrano Gasparnian <armenzg@mozilla.com>  Thu, 7 Nov 2013 14:30:00 -0500
 
 android-sdk18 (0.r18-0moz1) precise; urgency=low
 
   * Initial release
 
  -- Rail Aliiev <rail@mozilla.com>  Mon, 26 Aug 2013 16:40:44 -0400
diff --git a/modules/packages/manifests/android-sdk18-debian/rules b/modules/packages/manifests/android-sdk18-debian/rules
index f0aca24..29779d0 100644
--- a/modules/packages/manifests/android-sdk18-debian/rules
+++ b/modules/packages/manifests/android-sdk18-debian/rules
@@ -12,17 +12,18 @@ EXCLUDES = eclipse \
 	sdk/extras/android/compatibility/v7 \
 	sdk/extras/android/compatibility/v4 \
 	sdk/extras/google \
 	sdk/samples \
 	sdk/system-images
 ARCHIVE_PREFIX = adt-bundle-linux-x86-$(BUNDLE_VER)
 ARCHIVE = $(ARCHIVE_PREFIX).zip
 URL_PREFIX = http://dl.google.com/android/adt
-TOOLS_URL = http://people.mozilla.org/~gbrown/tools-tools_r22-patched.tar.gz
+PATCHED_TOOLS = tools-tools_r22-patched.tar.gz
+PATCHED_TOOLS_URL_PREFIX = http://people.mozilla.org/~gbrown/
 TARGET_DIR = orig-source
 
 %:
 	dh $@
 
 override_dh_install:
 	dh_install $(ARCH)/sdk/* tools/$(PKG_NAME)
 
@@ -32,23 +33,23 @@ override_dh_strip:
 override_dh_shlibdeps:
 	@echo skipping dh_shlibdeps
 
 
 adt-bundle-linux-%-$(BUNDLE_VER).zip:
 	@echo "# Downloading..."
 	wget -c -O $@ $(URL_PREFIX)/$@
 
-tools_download:
+$(PATCHED_TOOLS):
 	@echo "# Downloading..."
-	wget $(TOOLS_URL)
+	wget -c -O $@ $(PATCHED_TOOLS_URL_PREFIX)/$@
 
-get-orig-source: adt-bundle-linux-x86-$(BUNDLE_VER).zip adt-bundle-linux-x86_64-$(BUNDLE_VER).ziptools_download
+get-orig-source: adt-bundle-linux-x86-$(BUNDLE_VER).zip adt-bundle-linux-x86_64-$(BUNDLE_VER).zip $(PATCHED_TOOLS)
 	rm -rf $(TARGET_DIR)
 	unzip -q adt-bundle-linux-x86_64-$(BUNDLE_VER).zip -d $(TARGET_DIR)
 	mv $(TARGET_DIR)/adt-bundle-linux-x86_64-$(BUNDLE_VER) $(TARGET_DIR)/amd64
-	tar zxf tools-tools_r22-patched.tar.gz -C $(TARGET_DIR)/amd64/sdk/tools
+	tar zxf $(PATCHED_TOOLS) -C $(TARGET_DIR)/amd64/sdk/tools
 	rm -rf $(foreach dir,$(EXCLUDES),$(TARGET_DIR)/*/$(dir))
 	chmod -R a+rX $(TARGET_DIR)
 	tar cjf $(PKG_NAME)_$(VERSION).orig.tar.bz2 $(TARGET_DIR)
 	rm -rf $(TARGET_DIR)
 
 .PHONY: get-orig-source