diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-03-26 03:17:25 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-03-26 03:17:25 +0000 |
| commit | 1275c9aa223a10f503664db2dc95b82e54eb05f8 (patch) | |
| tree | 42b7956fa8b05dae83ca688af0700ff7dbb19261 | |
| parent | 7ec442cba4e192d02cf5782899b8c679a3a46e88 (diff) | |
Re #1822: Re r5018, removed non cross-platform "cp" command flag "-u".
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5025 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip-apps/src/pjsua/android/jni/Android.mk | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/swig/java/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pjsip-apps/src/pjsua/android/jni/Android.mk b/pjsip-apps/src/pjsua/android/jni/Android.mk index 826da8d3..59ea6b54 100644 --- a/pjsip-apps/src/pjsua/android/jni/Android.mk +++ b/pjsip-apps/src/pjsua/android/jni/Android.mk @@ -31,7 +31,7 @@ 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 + cp $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java src/org/pjsip # 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 19da66dc..4b1c4084 100644 --- a/pjsip-apps/src/swig/java/Makefile +++ b/pjsip-apps/src/swig/java/Makefile @@ -178,7 +178,7 @@ clean distclean realclean: 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)/.. + cp $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java $(MY_PACKAGE_PATH)/.. endif $(MY_PACKAGE_PATH)/Error.class: $(MY_PACKAGE_PATH)/Error.java |