Changeset 4574

Timestamp:

Jul 26, 2013 5:54:33 AM (11 years ago)

Author:

ming

Message:

JNI projects:

• Fix project setup for Android sample app

Location:

pjproject/branches/projects/jni/pjsip-apps/src/jni

Files:

• AndroidManifest.xml (modified) (1 diff)
• Makefile (added)
• jni/Android.mk (modified) (3 diffs)
• jni/swig_gen.py (modified) (1 diff)
• src/org/pjsip/hello/MainActivity.java (modified) (1 diff)
• src/org/pjsip/hello/hello.java (modified) (1 diff)

pjproject/branches/projects/jni/pjsip-apps/src/jni/AndroidManifest.xml

@@ -9 +9 @@
         android:targetSdkVersion="17" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.USE_SIP" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature
+        android:name="android.hardware.microphone"
+        android:required="true" />
+   
     <application
         android:allowBackup="true"

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

@@ -53 +53 @@
 
 # Android build settings
-LOCAL_PATH      := $(call my-dir)/pjsip-apps/src/jni
+LOCAL_PATH      := $(PJDIR)/pjsip-apps/src/jni
+include $(CLEAR_VARS)
 LOCAL_MODULE    := libpjsua
 LOCAL_MODULE_FILENAME := libpjsua
@@ -60 +61 @@
 LOCAL_LDLIBS    := $(APP_LDLIBS)
 LOCAL_SRC_FILES := $(MY_SWIG_WRAPPER).cpp $(MY_OUT_DIR)/callbacks.cpp
-
-MY_JNI_WRAP     := $(LOCAL_PATH)/$(MY_SWIG_WRAPPER).cpp
 
 jni: $(MY_JNI_LIB) java
@@ -99 +98 @@
         $(MY_JAVA) -cp $(MY_PACKAGE_BIN) -Djava.library.path="$(MY_PACKAGE_BIN)" hello
 
-$(MY_JNI_WRAP): $(MY_SWIG_WRAPPER).cpp
+$(LOCAL_PATH)/$(MY_SWIG_WRAPPER).cpp: $(MY_SWIG_WRAPPER).cpp
 
-.PHONY: $(MY_JNI_WRAP)
+$(LOCAL_PATH)/$(MY_OUT_DIR)/callbacks.cpp: $(MY_OUT_DIR)/callbacks.cpp
 
 include $(BUILD_SHARED_LIBRARY)

pjproject/branches/projects/jni/pjsip-apps/src/jni/jni/swig_gen.py

@@ -22 +22 @@
 else:
     PYCPARSER_DIR="/Library/Python/2.7/site-packages/pycparser"
-    CPP_PATH='/Users/ming/teluu/android/android-ndk-r7c/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-cpp'
+    CPP_PATH='/Users/ming/teluu/android/android-ndk-r8e/toolchains/arm-linux-androideabi-4.7/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-cpp'
 
 # CPP (C preprocessor) settings

pjproject/branches/projects/jni/pjsip-apps/src/jni/src/org/pjsip/hello/MainActivity.java

@@ -11 +11 @@
                 super.onCreate(savedInstanceState);
                 setContentView(R.layout.activity_main);
+                
+                /* Call test app here
+                String [] args = {"sip:192.168.1.49"};
+                hello.main(args);
+                */
         }
 

pjproject/branches/projects/jni/pjsip-apps/src/jni/src/org/pjsip/hello/hello.java

@@ -1 +1 @@
 /* $Id: hello.java 4566 2013-07-17 20:20:50Z nanang $ */
+
+package org.pjsip.hello;
 
 import java.io.BufferedReader;