Changeset 5513 for pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/android

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip-apps/src/pjsua/android (modified) (1 prop)
• pjsip-apps/src/pjsua/android/.classpath (deleted)
• pjsip-apps/src/pjsua/android/.project (deleted)
• pjsip-apps/src/pjsua/android/AndroidManifest.xml (deleted)
• pjsip-apps/src/pjsua/android/app (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/app)
• pjsip-apps/src/pjsua/android/assets (deleted)
• pjsip-apps/src/pjsua/android/build.gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/build.gradle)
• pjsip-apps/src/pjsua/android/gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/gradle)
• pjsip-apps/src/pjsua/android/gradlew (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/gradlew)
• pjsip-apps/src/pjsua/android/gradlew.bat (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/gradlew.bat)
• pjsip-apps/src/pjsua/android/jni/Android.mk (deleted)
• pjsip-apps/src/pjsua/android/jni/Application.mk (deleted)
• pjsip-apps/src/pjsua/android/jni/Makefile (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/jni/Makefile)
• pjsip-apps/src/pjsua/android/jni/pjsua.i (modified) (1 diff)
• pjsip-apps/src/pjsua/android/lint.xml (deleted)
• pjsip-apps/src/pjsua/android/proguard-project.txt (deleted)
• pjsip-apps/src/pjsua/android/project.properties (deleted)
• pjsip-apps/src/pjsua/android/res (deleted)
• pjsip-apps/src/pjsua/android/settings.gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/settings.gradle)
• pjsip-apps/src/pjsua/android/src (deleted)

pjproject/branches/projects/uwp/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/branches/projects/uwp/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