diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-03-26 09:54:18 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-03-26 09:54:18 +0000 |
| commit | c184c50e62e65131b1546b0aa622b20aa64f62a5 (patch) | |
| tree | 9bc9ccc853820f6aa4100b3cffc7cac92642b2e9 | |
| parent | 4a925f7f5401af1c0a410a648b06d2255a6935bb (diff) | |
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: http://svn.pjsip.org/repos/pjproject/trunk@5029 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | build.mak.in | 3 | ||||
| -rw-r--r-- | pjmedia/build/os-auto.mak.in | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/pjsua/android/jni/Android.mk | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/swig/java/Makefile | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/build.mak.in b/build.mak.in index 61b156dd..8a986d76 100644 --- a/build.mak.in +++ b/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@ diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in index c4f7d5ae..7a072745 100644 --- a/pjmedia/build/os-auto.mak.in +++ b/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 diff --git a/pjsip-apps/src/pjsua/android/jni/Android.mk b/pjsip-apps/src/pjsua/android/jni/Android.mk index 59ea6b54..7beef53e 100644 --- a/pjsip-apps/src/pjsua/android/jni/Android.mk +++ b/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 diff --git a/pjsip-apps/src/swig/java/Makefile b/pjsip-apps/src/swig/java/Makefile index 4b1c4084..449e59cb 100644 --- a/pjsip-apps/src/swig/java/Makefile +++ b/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 |