Re #1822: Misc fix in Android video device build setting:

- fixed silly typo caused Android video device sources not being built
 - avoid copying Android camera helper codes when video is disabled



git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5029 74dad513-b988-da41-8d7b-12977e46ad98

build.mak.in

@@ -152,6 +152,9 @@ QT_CFLAGS = @ac_qt_cflags@
 # iOS
 IOS_CFLAGS = @ac_ios_cflags@
 
+# Android
+ANDROID_CFLAGS = @ac_android_cflags@
+
 # libyuv
 LIBYUV_CFLAGS = @ac_libyuv_cflags@ 
 LIBYUV_LDFLAGS =  @ac_libyuv_ldflags@

pjmedia/build/os-auto.mak.in

@@ -235,7 +235,7 @@ endif
 #
 # Android video device
 #
-ifeq ($(AC_PJMEDIA_VIDEO),andriod_os)
+ifeq ($(AC_PJMEDIA_VIDEO),android_os)
 export PJMEDIA_VIDEODEV_OBJS += android_dev.o android_opengl.o
 endif
 

pjsip-apps/src/pjsua/android/jni/Android.mk

@@ -30,8 +30,10 @@ LOCAL_SRC_FILES := $(MY_JNI_WRAP) pjsua_app_callback.cpp
 
 # Copy Java Camera helper components from pjmedia/src/pjmedia-videodev/android
 src/org/pjsip/PjCamera.java:
+ifneq (,$(findstring PJMEDIA_VIDEO_DEV_HAS_ANDROID=1,$(ANDROID_CFLAGS)))
 	@echo "Copying Android camera helper components..."
 	cp $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java src/org/pjsip
+endif
 
 # Invoke SWIG
 $(MY_JNI_DIR)/$(MY_JNI_WRAP): src/org/pjsip/PjCamera.java

pjsip-apps/src/swig/java/Makefile

@@ -176,7 +176,7 @@ clean distclean realclean:
 		$(MY_PACKAGE_PATH)/*.java $(MY_PACKAGE_PATH)/*.class
 
 java: $(MY_PACKAGE_PATH)/Error.class $(MY_PACKAGE_PATH)/test.class $(MY_PACKAGE_PATH)/sample.class
-ifeq ($(OS),android)
+ifneq (,$(findstring PJMEDIA_VIDEO_DEV_HAS_ANDROID=1,$(ANDROID_CFLAGS)))
 	@echo "Copying Android camera helper components..."
 	cp $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java $(MY_PACKAGE_PATH)/..
 endif