Changeset 5506

Timestamp:

Dec 21, 2016 8:33:57 AM (8 years ago)

Author:

nanang

Message:

Re #1986: Convert pjsua sample app Android project from Eclipse to Android Studio.

Location:

pjproject/trunk/pjsip-apps/src/pjsua/android

Files:

• . (modified) (1 prop)
• .classpath (deleted)
• .project (deleted)
• AndroidManifest.xml (deleted)
• app (added)
• app/build.gradle (added)
• app/src (added)
• app/src/main (added)
• app/src/main/AndroidManifest.xml (added)
• app/src/main/java (added)
• app/src/main/java/org (added)
• app/src/main/java/org/pjsip (added)
• app/src/main/java/org/pjsip/pjsua (added)
• app/src/main/java/org/pjsip/pjsua/MainActivity.java (added)
• app/src/main/jniLibs (added)
• app/src/main/jniLibs/armeabi (added)
• app/src/main/res (added)
• app/src/main/res/drawable-hdpi (added)
• app/src/main/res/drawable-hdpi/main_image.png (added)
• app/src/main/res/drawable-ldpi (added)
• app/src/main/res/drawable-ldpi/main_image.png (added)
• app/src/main/res/drawable-mdpi (added)
• app/src/main/res/drawable-mdpi/main_image.png (added)
• app/src/main/res/drawable-xhdpi (added)
• app/src/main/res/drawable-xhdpi/main_image.png (added)
• app/src/main/res/layout (added)
• app/src/main/res/layout/activity_main.xml (added)
• app/src/main/res/values (added)
• app/src/main/res/values-v11 (added)
• app/src/main/res/values-v11/styles.xml (added)
• app/src/main/res/values-v14 (added)
• app/src/main/res/values-v14/styles.xml (added)
• app/src/main/res/values/strings.xml (added)
• app/src/main/res/values/styles.xml (added)
• assets (deleted)
• build.gradle (added)
• gradle (added)
• gradle/wrapper (added)
• gradle/wrapper/gradle-wrapper.jar (added)
• gradle/wrapper/gradle-wrapper.properties (added)
• gradlew (added)
• gradlew.bat (added)
• jni/Android.mk (deleted)
• jni/Application.mk (deleted)
• jni/Makefile (added)
• jni/pjsua.i (modified) (1 diff)
• lint.xml (deleted)
• proguard-project.txt (deleted)
• project.properties (deleted)
• res (deleted)
• settings.gradle (added)
• src (deleted)

pjproject/trunk/pjsip-apps/src/pjsua/android

@@ -1 @@
-bin
-obj
-libs
-gen
-.settings
-.*
-
+.gradle
+.idea
+build
+android.iml
+local.properties

@@ -1 @@
-bin
-obj
-libs
-gen
-.settings
-.*
-
+.gradle
+.idea
+build
+android.iml
+local.properties

pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua.i

@@ -2 +2 @@
 
 %{
-#include "pjsua_app_callback.h"
-#include "../../pjsua_app.h"
+#include "../../jni/pjsua_app_callback.h"
+#include "../../../pjsua_app.h"
 
 #if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO!=0

@@ -1 @@
-bin
-obj
-libs
-gen
-.settings
-.*
-
+.gradle
+.idea
+build
+android.iml
+local.properties