diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-03-23 06:28:40 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-03-23 06:28:40 +0000 |
| commit | 2a4634c8e713cf6a781136f7bc3059db3104de97 (patch) | |
| tree | c60e53754e04badf4049d39507dd0f7ef53d3269 /pjsip-apps/src/pjsua/android/jni | |
| parent | 9022f2f9cf0d1f99abb33e2393f78897c3cdbefa (diff) | |
Re #1822: Moved Android camera helper (PjCamera.java and PjCameraInfo.java) from sample app to pjmedia-video dev dir.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5018 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/pjsua/android/jni')
| -rw-r--r-- | pjsip-apps/src/pjsua/android/jni/Android.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pjsip-apps/src/pjsua/android/jni/Android.mk b/pjsip-apps/src/pjsua/android/jni/Android.mk index b1f99af6..826da8d3 100644 --- a/pjsip-apps/src/pjsua/android/jni/Android.mk +++ b/pjsip-apps/src/pjsua/android/jni/Android.mk @@ -28,8 +28,13 @@ LOCAL_LDFLAGS := $(APP_LDFLAGS) LOCAL_LDLIBS := $(MY_MODULES) $(APP_LDLIBS) 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 |