Changeset 5018 for pjproject


Ignore:
Timestamp:
Mar 23, 2015 6:28:40 AM (7 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:
3 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/pjsua/android/jni/Android.mk

    r4526 r5018  
    2929LOCAL_SRC_FILES := $(MY_JNI_WRAP) pjsua_app_callback.cpp 
    3030 
     31# Copy Java Camera helper components from pjmedia/src/pjmedia-videodev/android 
     32src/org/pjsip/PjCamera.java: 
     33        @echo "Copying Android camera helper components..." 
     34        cp -u $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java src/org/pjsip 
     35 
    3136# Invoke SWIG 
    32 $(MY_JNI_DIR)/$(MY_JNI_WRAP): 
     37$(MY_JNI_DIR)/$(MY_JNI_WRAP): src/org/pjsip/PjCamera.java 
    3338        @echo "Invoking SWIG..." 
    3439        $(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/pjsua/android/src/org/pjsip

    • Property svn:ignore set to
      PjCamera*.java
  • pjproject/trunk/pjsip-apps/src/swig/java/Makefile

    r4996 r5018  
    177177 
    178178java: $(MY_PACKAGE_PATH)/Error.class $(MY_PACKAGE_PATH)/test.class $(MY_PACKAGE_PATH)/sample.class 
     179ifeq ($(OS),android) 
     180        @echo "Copying Android camera helper components..." 
     181        cp -u $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java $(MY_PACKAGE_PATH)/.. 
     182endif 
    179183 
    180184$(MY_PACKAGE_PATH)/Error.class: $(MY_PACKAGE_PATH)/Error.java 
  • pjproject/trunk/pjsip-apps/src/swig/java/android/src/org/pjsip

    • Property svn:ignore set to
      PjCamera*.java
Note: See TracChangeset for help on using the changeset viewer.