summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorYouness Alaoui <youness.alaoui@collabora.co.uk>2012-10-23 10:12:52 -0400
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2016-01-21 12:44:39 -0500
commitaa390e1be463c5c786ecb920d2983fbe325404ea (patch)
treefccd51872d97cb45c9d10ee86791c456785c75e6 /sys
parente78143f839284b81615bf8279a23aab7f2da8ac6 (diff)
downloadgstreamer-plugins-bad-aa390e1be463c5c786ecb920d2983fbe325404ea.tar.gz
androidmedia: Disable plugin if android-sdk isn't found and dynamically search for platform version
Diffstat (limited to 'sys')
-rw-r--r--sys/androidcamera/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/androidcamera/Makefile.am b/sys/androidcamera/Makefile.am
index bea49c16f..fa62d7d47 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 "" >> $@