Changeset 5029 for pjproject


Ignore:
Timestamp:
Mar 26, 2015 9:54:18 AM (10 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
Location:
pjproject/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/build.mak.in

    r4875 r5029  
    152152# iOS 
    153153IOS_CFLAGS = @ac_ios_cflags@ 
     154 
     155# Android 
     156ANDROID_CFLAGS = @ac_android_cflags@ 
    154157 
    155158# libyuv 

  • pjproject/trunk/pjmedia/build/os-auto.mak.in

    r5027 r5029  
    236236# Android video device 
    237237# 
    238 ifeq ($(AC_PJMEDIA_VIDEO),andriod_os) 
     238ifeq ($(AC_PJMEDIA_VIDEO),android_os) 
    239239export PJMEDIA_VIDEODEV_OBJS += android_dev.o android_opengl.o 
    240240endif 

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

    r5025 r5029  
    3131# Copy Java Camera helper components from pjmedia/src/pjmedia-videodev/android 
    3232src/org/pjsip/PjCamera.java: 
     33ifneq (,$(findstring PJMEDIA_VIDEO_DEV_HAS_ANDROID=1,$(ANDROID_CFLAGS))) 
    3334        @echo "Copying Android camera helper components..." 
    3435        cp $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java src/org/pjsip 
     36endif 
    3537 
    3638# Invoke SWIG 

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

    r5025 r5029  
    177177 
    178178java: $(MY_PACKAGE_PATH)/Error.class $(MY_PACKAGE_PATH)/test.class $(MY_PACKAGE_PATH)/sample.class 
    179 ifeq ($(OS),android) 
     179ifneq (,$(findstring PJMEDIA_VIDEO_DEV_HAS_ANDROID=1,$(ANDROID_CFLAGS))) 
    180180        @echo "Copying Android camera helper components..." 
    181181        cp $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java $(MY_PACKAGE_PATH)/.. 
Note: See TracChangeset for help on using the changeset viewer.