Changeset 4575 for pjproject/branches/projects/jni/pjsip-apps/src/jni/jni/Android.mk

Timestamp:

Jul 26, 2013 9:16:37 AM (10 years ago)

Author:

nanang

Message:

JNI projects:

• separate makefile for Android and desktop/development
• simplify build process for Android (upload pregenerated SWIG interface)
• removed main loop for Android sample app

File:

• pjproject/branches/projects/jni/pjsip-apps/src/jni/jni/Android.mk (modified) (5 diffs)

pjproject/branches/projects/jni/pjsip-apps/src/jni/jni/Android.mk

@@ -18 +18 @@
 endif
 
-# OS specific
-ifeq ($(OS),Windows_NT)
-MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,--kill-at
-MY_JNI_LIB       = $(MY_PACKAGE_BIN)/pjsua.dll
-else
 MY_JNI_LDFLAGS   = -L$(MY_JDK)/lib -Wl,-soname,pjsua.so
 MY_JNI_LIB       = $(MY_PACKAGE_BIN)/libpjsua.so
 MY_JNI_CFLAGS    := -fPIC
-endif
 
 # Env settings, e.g: path to SWIG, JDK, java(.exe), javac(.exe)
@@ -44 +38 @@
 MY_OUT_DIR       = jni/output
 MY_SWIG_IF       = $(MY_OUT_DIR)/pjsua.i
-MY_SWIG_FLAG     = -c++ -I$(MY_OUT_DIR) # -debug-tmsearch -debug-tmused # -Wall
+MY_SWIG_FLAG     = -c++ -I$(MY_OUT_DIR)
 MY_SWIG_WRAPPER  = $(MY_OUT_DIR)/pjsua_wrap
 MY_PACKAGE_SRC   = src/$(subst .,/,$(MY_PACKAGE))
@@ -65 +59 @@
 
 clean:
-        rm -rf $(MY_OUT_DIR)
+        rm -rf $(MY_SWIG_WRAPPER).*
         rm -rf $(MY_PACKAGE_SRC)
-
-$(MY_SWIG_IF).tmp: jni/swig_gen.py
-        @mkdir -p $(MY_OUT_DIR)
-        python jni/swig_gen.py > $(MY_SWIG_IF).tmp
-
-$(MY_SWIG_IF): jni/header.i $(MY_SWIG_IF).tmp
-        cat jni/header.i > $(MY_SWIG_IF)
-        cat $(MY_SWIG_IF).tmp >> $(MY_SWIG_IF)
 
 $(MY_SWIG_WRAPPER).cpp: $(MY_SWIG_IF) jni/callbacks.i jni/my_typemaps.i
@@ -81 +67 @@
         @mkdir -p $(MY_PACKAGE_SRC)
         $(MY_SWIG) $(MY_SWIG_FLAG) -o $(MY_SWIG_WRAPPER).cpp -package $(MY_PACKAGE) \
-                -outdir $(MY_PACKAGE_SRC) -java $(MY_SWIG_IF) > $(MY_SWIG_WRAPPER)-tm.log
+                -outdir $(MY_PACKAGE_SRC) -java $(MY_SWIG_IF)
 
 $(MY_JNI_LIB): $(MY_SWIG_WRAPPER).cpp
@@ -88 +74 @@
                 $(MY_CFLAGS) $(MY_LDFLAGS)
 
-java: $(TEST_SRC)/hello.java
-        @mkdir -p $(MY_PACKAGE_BIN)
-        $(MY_JAVAC) -d $(MY_PACKAGE_BIN) $(MY_PACKAGE_SRC)/*.java
-        $(MY_JAVAC) -d $(MY_PACKAGE_BIN) -classpath "$(MY_PACKAGE_BIN)" $(TEST_SRC)/hello.java
-
-test: $(MY_PACKAGE_BIN)/hello.class
-        @# Need to specify classpath and library path, alternatively, they can be set via
-        @# CLASSPATH and java.library.path env settings
-        $(MY_JAVA) -cp $(MY_PACKAGE_BIN) -Djava.library.path="$(MY_PACKAGE_BIN)" hello
-
 $(LOCAL_PATH)/$(MY_SWIG_WRAPPER).cpp: $(MY_SWIG_WRAPPER).cpp