diff options
author | Riza Sulistyo <riza@teluu.com> | 2013-05-28 12:20:21 +0000 |
---|---|---|
committer | Riza Sulistyo <riza@teluu.com> | 2013-05-28 12:20:21 +0000 |
commit | 3ee10ffd42c60b7e4ba79cae3c59323da2fd4aac (patch) | |
tree | eaa46b6e851264b271f522f21f7a7d7d675d29bf /pjsip-apps/src | |
parent | e18bd6d1665ae3e5112eb09ef5e085d2f39408bb (diff) |
Re #1655:
- Optimize android make file
- Modify android project file to enable native debugging on eclipse
- Add pjsua.cpp to svn ignore
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4526 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src')
-rw-r--r-- | pjsip-apps/src/pjsua/android/.project | 68 | ||||
-rw-r--r-- | pjsip-apps/src/pjsua/android/jni/Android.mk | 39 |
2 files changed, 8 insertions, 99 deletions
diff --git a/pjsip-apps/src/pjsua/android/.project b/pjsip-apps/src/pjsua/android/.project index ec83832d..937a12d5 100644 --- a/pjsip-apps/src/pjsua/android/.project +++ b/pjsip-apps/src/pjsua/android/.project @@ -6,64 +6,6 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> - <triggers>clean,full,incremental,</triggers> - <arguments> - <dictionary> - <key>?name?</key> - <value></value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.append_environment</key> - <value>true</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.autoBuildTarget</key> - <value>all</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.buildArguments</key> - <value></value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.buildCommand</key> - <value>make</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.cleanBuildTarget</key> - <value>clean</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.contents</key> - <value>org.eclipse.cdt.make.core.activeConfigSettings</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.enableAutoBuild</key> - <value>false</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.enableCleanBuild</key> - <value>true</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.enableFullBuild</key> - <value>true</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.fullBuildTarget</key> - <value>all</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.stopOnError</key> - <value>true</value> - </dictionary> - <dictionary> - <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key> - <value>true</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> <arguments> </arguments> @@ -83,19 +25,9 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>com.android.ide.eclipse.adt.AndroidNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.cdt.core.cnature</nature> - <nature>org.eclipse.cdt.core.ccnature</nature> - <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature> - <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature> </natures> </projectDescription> diff --git a/pjsip-apps/src/pjsua/android/jni/Android.mk b/pjsip-apps/src/pjsua/android/jni/Android.mk index bcbdbbd6..b1f99af6 100644 --- a/pjsip-apps/src/pjsua/android/jni/Android.mk +++ b/pjsip-apps/src/pjsua/android/jni/Android.mk @@ -1,4 +1,4 @@ -# $id$ +# $Id$ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -10,35 +10,12 @@ include $(PJDIR)/build/common.mak # Path to SWIG MY_SWIG := swig -#======================================================================== -# Choose console application to load -#======================================================================== - -# pjlib test -#MY_MODULE := $(PJDIR)/pjlib/build/output/pjlib-test-$(TARGET_NAME)/*.o - -# pjlib-util test -#MY_MODULE := $(PJDIR)/pjlib-util/build/output/pjlib-util-test-$(TARGET_NAME)/*.o - -# pjsip test -#MY_MODULE := $(PJDIR)/pjsip/build/output/pjsip-test-$(TARGET_NAME)/*.o - -# pjnath test -#MY_MODULE := $(PJDIR)/pjnath/build/output/pjnath-test-$(TARGET_NAME)/*.o - -# pjmedia test -# Note: jbuf test requires Jbtest.dat, this jbuf test must be disabled (for now). -#MY_MODULE := $(PJDIR)/pjmedia/build/output/pjmedia-test-$(TARGET_NAME)/*.o - -# pjsystest app (not supported yet) -# Todo: this test requires some input and output files (log & WAV). -#MY_MODULE := $(PJDIR)/pjsip-apps/build/output/pjsystest-$(TARGET_NAME)/*.o - -# pjsua app -# Note: must set USE_GUI to zero in config_site.h -MY_MODULE := $(PJDIR)/pjsip-apps/build/output/pjsua-$(TARGET_NAME)/*.o - -#======================================================================== +MY_MODULE_PATH := $(PJDIR)/pjsip-apps/build/output/pjsua-$(TARGET_NAME) +MY_MODULES := $(MY_MODULE_PATH)/pjsua_app.o \ + $(MY_MODULE_PATH)/pjsua_app_cli.o \ + $(MY_MODULE_PATH)/pjsua_app_common.o \ + $(MY_MODULE_PATH)/pjsua_app_config.o \ + $(MY_MODULE_PATH)/pjsua_app_legacy.o # Constants MY_JNI_WRAP := pjsua_wrap.cpp @@ -48,7 +25,7 @@ MY_JNI_DIR := jni LOCAL_MODULE := libpjsua LOCAL_CFLAGS := -Werror $(APP_CFLAGS) -frtti LOCAL_LDFLAGS := $(APP_LDFLAGS) -LOCAL_LDLIBS := $(MY_MODULE) $(APP_LDLIBS) +LOCAL_LDLIBS := $(MY_MODULES) $(APP_LDLIBS) LOCAL_SRC_FILES := $(MY_JNI_WRAP) pjsua_app_callback.cpp # Invoke SWIG |