From aa390e1be463c5c786ecb920d2983fbe325404ea Mon Sep 17 00:00:00 2001
From: Youness Alaoui <youness.alaoui@collabora.co.uk>
Date: Tue, 23 Oct 2012 10:12:52 -0400
Subject: [PATCH] androidmedia: Disable plugin if android-sdk isn't found and
 dynamically search for platform version

---
 sys/androidcamera/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/androidcamera/Makefile.am b/sys/androidcamera/Makefile.am
index bea49c16fd..fa62d7d470 100644
--- a/sys/androidcamera/Makefile.am
+++ b/sys/androidcamera/Makefile.am
@@ -37,9 +37,10 @@ CLEANFILES = gstahccallback.c
 if HAVE_ANDROID_SDK
 gstahccallback.c: $(JAVA_SOURCE)
 	@echo "  JAVAC $(JAVA_SOURCE)"
-	@$(JAVAC) -target 1.6 -source 1.6 -nowarn -classpath $(ANDROID_SDK_DIR)/platforms/android-14/android.jar $(JAVA_SOURCE)
+	@$(JAVAC) -target 1.6 -source 1.6 -nowarn \
+	 -classpath $(ANDROID_SDK_DIR)/platforms/android-$(ANDROID_PLATFORM)/android.jar $(JAVA_SOURCE)
 	@echo "  DEX $(JAVA_SOURCE:.java=.class)"
-	@$(ANDROID_SDK_DIR)/platform-tools/dx --dex --output GstAhcCallback.jar $(JAVA_SOURCE:.java=.class)
+	@$(DX) --dex --output GstAhcCallback.jar $(JAVA_SOURCE:.java=.class)
 	@echo "  GEN $@"
 	@echo "#include \"gstahccallback.h\"" > $@
 	@echo "" >> $@