Changeset 5029 for pjproject/trunk/pjsip-apps/src/swig/java/Makefile

Timestamp:

Mar 26, 2015 9:54:18 AM (9 years ago)

Author:

nanang

Message:

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

File:

• pjproject/trunk/pjsip-apps/src/swig/java/Makefile (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/swig/java/Makefile

@@ -177 +177 @@
 
 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)/..