Changes between Version 69 and Version 70 of Getting-Started/Android

Timestamp:

Jan 18, 2017 1:15:21 PM (8 years ago)

Author:

nanang

Comment:

Replaced Eclipse with Android Studio

Getting-Started/Android

@@ -9 +9 @@
 
  * Besides the [http://developer.android.com/sdk/index.html Android SDK], you will also need the [http://developer.android.com/tools/sdk/ndk/index.html Android NDK] (minimum version r8b).
- * Optional if you want to build and and run the sample application PJSUA:
+ * Optional if you want to build and and run the sample applications (i.e: pjsua2 and pjsua):
   * [http://www.swig.org/download.html SWIG] (minimum version 2.0.5)
-  * Eclipse with [http://developer.android.com/tools/sdk/eclipse-adt.html ADT Plugin].
+  * ~~Eclipse with [http://developer.android.com/tools/sdk/eclipse-adt.html ADT Plugin]~~ (deprecated since 2.6)
+  * [https://developer.android.com/studio/index.html Android Studio]
   * Telnet application to interact with PJSUA command line. If you are not familiar with telnet, please find a tutorial suitable for your development platform.
 
@@ -144 +145 @@
      }}}
     This step should produce:
-    - native library {{{libpjsua2.so}}} in {{{pjsip-apps/src/swig/java/android/libs/armeabi}}}
-      - note: if you are building for other target ABI, you'll need to manually move {{{libpjsua2.so}}} to the appropriate target ABI directory, e.g: {{{libs/armeabi-v7a}}}, please check [https://developer.android.com/ndk/guides/abis.html#am here] for target ABI directory names.
-    - pjsua2 Java interface (a lot of {{{.java}}} files) in {{{pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2}}}
- 1. Make sure any library dependencies are copied to {{{pjsip-apps/src/swig/java/android/libs/armeabi}}} (or the appropriate target ABI directory), e.g: {{{libyuv.so & libopenh264.so}}} for video support.
- 1. Create Android project from pjsua. In Eclipse:
-    a. From menu: '''File''' --> '''New''' --> '''Project'''
-    a. Select '''Android Project from Existing Code''', press '''Next'''
-    a. In ''Root Directory'', put the location of '''pjsua2''' source code (i.e. {{{$PJDIR/pjsip-apps/src/swig/java/android}}}) and press '''Finish'''
- 1. You may need to select different Android SDK than what is configured in pjsua2. You can do this from the project's '''Properties'''.
+    - native library {{{libpjsua2.so}}} in {{{pjsip-apps/src/swig/java/android/app/src/main/jniLibs/armeabi}}}
+      - note: if you are building for other target ABI, you'll need to manually move {{{libpjsua2.so}}} to the appropriate target ABI directory, e.g: {{{jniLibs/armeabi-v7a}}}, please check [https://developer.android.com/ndk/guides/abis.html#am here] for target ABI directory names.
+    - pjsua2 Java interface (a lot of {{{.java}}} files) in {{{pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2}}}
+ 1. Make sure any library dependencies are copied to {{{pjsip-apps/src/swig/java/android/app/src/main/jniLibs/armeabi}}} (or the appropriate target ABI directory), e.g: {{{libopenh264.so}}} for video support.
+ 1. Open pjsua2 app project in Android Studio, it is located in {{{pjsip-apps/src/swig/java/android}}}.
  1. Run it.
 
 === Log output ===
 
-The pjsua2 sample application will write log messages to '''!LogCat''' window (to show !LogCat window, from Eclipse menu: '''Window''' --> '''Show View''' --> '''Other''' --> type ''!LogCat'')
+The pjsua2 sample application will write log messages to '''!LogCat''' window.
 
 
@@ -163 +160 @@
 
 For developing Android application, you should use [http://www.pjsip.org/docs/book-latest/html/index.html pjsua2 API] whose Java interface available via SWIG Java binding.
-
-Note that this has only been tested using [http://developer.android.com/tools/help/adt.html Eclipse with ADT], however it might also be applicable for [http://developer.android.com/tools/studio/index.html Android Studio].
 
  1. First, build {{{pjproject}}} libraries as described above.
@@ -170 +165 @@
  1. Create Android application outside the PJSIP sources for your project.
  1. Get pjsua2 Java interface and native library from pjsua2 sample application:
-    1. Copy pjsua2 Java interface files from {{{pjsip-apps/src/swig/java/android/src}}} to your project's {{{src}}} folder:
+    1. Copy pjsua2 Java interface files from {{{pjsip-apps/src/swig/java/android/app/src/main/java}}} to your project's {{{app/src/main/java}}} folder, e.g:
        {{{
-$ cd $YOUR_PROJECT_DIR
-$ cp -r $PJSIP_DIR/pjsip-apps/src/swig/java/android/src .
+$ cd $YOUR_PROJECT_DIR/app/src/main/java
+$ cp -r $PJSIP_DIR/pjsip-apps/src/swig/java/android/app/src/main/java .
 
 # Cleanup excess pjsua2 application sources.
-$ rm -r src/org/pjsip/pjsua2/app
+$ rm -r org/pjsip/pjsua2/app
        }}}
-    1. Copy native library {{{libpjsua2.so}}} from {{{pjsip-apps/src/swig/java/android/libs}}} to your project's {{{libs}}} folder:
+    1. Copy native library {{{libpjsua2.so}}} from {{{pjsip-apps/src/swig/java/android/app/src/main/jniLibs}}} to your project's {{{app/src/main/jniLibs}}} folder:
        {{{
-$ cd $YOUR_PROJECT_DIR
-$ cp -r $PJSIP_DIR/pjsip-apps/src/swig/java/android/libs .
+$ cd $YOUR_PROJECT_DIR/app/src/main/jniLibs
+$ cp -r $PJSIP_DIR/{pjsip-apps/src/swig/java/android/app/src/main/jniLibs .
        }}}
  1. Start writing your application, please check [http://www.pjsip.org/docs/book-latest/html/index.html pjsua2 docs] for reference.
@@ -192 +187 @@
 Follow these steps to build pjsua:
  1. Make sure SWIG is in the build environment PATH.
-     - Alternatively, update SWIG path in {{{$PJDIR/pjsip-apps/src/pjsua/android/jni/Android.mk}}} file.
- 1. Run {{{ndk-build}}} from directory {{{$PJDIR/pjsip-apps/src/pjsua/android}}} (note that the Android NDK root should be in the PATH), e.g:
+     - Alternatively, update SWIG path in {{{$PJDIR/pjsip-apps/src/pjsua/android/jni/Makefile}}} file.
+ 1. Run {{{make}}} from directory {{{$PJDIR/pjsip-apps/src/pjsua/android/jni}}} (note that the Android NDK root should be in the PATH), e.g:
      {{{
 $ cd /path/to/your/pjsip/dir
-$ cd pjsip-apps/src/pjsua/android
-$ ndk-build
+$ cd pjsip-apps/src/pjsua/android/jni
+$ make
      }}}
- 1. Create Android project from pjsua. In Eclipse:
-    a. From menu: '''File''' --> '''New''' --> '''Project'''
-    a. Select '''Android Project from Existing Code''', press '''Next'''
-    a. In ''Root Directory'', put the location of '''pjsua''' source code (i.e. {{{$PJDIR/pjsip-apps/src/pjsua/android}}}) and press '''Finish'''
- 1. You may need to select different Android SDK than what is configured in pjsua. You can do this from the project's '''Properties'''.
+ 1. Open pjsua2 app project in Android Studio, it is located in {{{pjsip-apps/src/pjsua/android}}}.
  1. Run it.
  1. You will see telnet instructions on the device's screen. Telnet to this address to operate the application. See [wiki:PJSUA-CLI PJSUA CLI Manual] for command reference.
 
+
+{{{#!comment
 
 == Debugging native code with Eclipse == #debug-native
@@ -234 +227 @@
      }}}
  1. Load the PJSIP project to Eclipse (if not yet), and try put breakpoint anywhere in the PJSIP code before launching the Android application debug configuration in Eclipse.
+
+}}}
+
 
 == OpenSSL Support ==