Changeset 5018 for pjproject

Timestamp:

Mar 23, 2015 6:28:40 AM (10 years ago)

Author:

nanang

Message:

Re #1822: Moved Android camera helper (PjCamera?.java and PjCameraInfo?.java) from sample app to pjmedia-video dev dir.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-videodev/android (added)
• pjmedia/src/pjmedia-videodev/android/PjCamera.java (added)
• pjmedia/src/pjmedia-videodev/android/PjCameraInfo.java (added)
• pjsip-apps/src/pjsua/android/jni/Android.mk (modified) (1 diff)
• pjsip-apps/src/pjsua/android/src/org/pjsip (modified) (1 prop)
• pjsip-apps/src/pjsua/android/src/org/pjsip/PjCamera.java (deleted)
• pjsip-apps/src/pjsua/android/src/org/pjsip/PjCameraInfo.java (deleted)
• pjsip-apps/src/swig/java/Makefile (modified) (1 diff)
• pjsip-apps/src/swig/java/android/src/org/pjsip (modified) (1 prop)

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

@@ -29 +29 @@
 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:
+        @echo "Copying Android camera helper components..."
+        cp -u $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java src/org/pjsip
+
 # Invoke SWIG
-$(MY_JNI_DIR)/$(MY_JNI_WRAP):
+$(MY_JNI_DIR)/$(MY_JNI_WRAP): src/org/pjsip/PjCamera.java
         @echo "Invoking SWIG..."
         $(MY_SWIG) -c++ -o $(MY_JNI_DIR)/$(MY_JNI_WRAP) -package org.pjsip.pjsua -outdir src/org/pjsip/pjsua -java $(MY_JNI_DIR)/pjsua.i

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)
+        @echo "Copying Android camera helper components..."
+        cp -u $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java $(MY_PACKAGE_PATH)/..
+endif
 
 $(MY_PACKAGE_PATH)/Error.class: $(MY_PACKAGE_PATH)/Error.java