Changeset 5502

Timestamp:

Dec 19, 2016 4:48:35 AM (8 years ago)

Author:

nanang

Message:

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

Location:

pjproject/trunk/pjsip-apps/src/swig/java

Files:

• Makefile (modified) (2 diffs)
• android (modified) (1 prop)
• android/.classpath (deleted)
• android/.project (deleted)
• android/.settings (deleted)
• android/AndroidManifest.xml (deleted)
• android/app (added)
• android/app/build.gradle (added)
• android/app/src (added)
• android/app/src/main (added)
• android/app/src/main/AndroidManifest.xml (added)
• android/app/src/main/java (added)
• android/app/src/main/java/org (added)
• android/app/src/main/java/org/pjsip (added)
• android/app/src/main/java/org/pjsip/PjCamera.java (added)
• android/app/src/main/java/org/pjsip/PjCameraInfo.java (added)
• android/app/src/main/java/org/pjsip/pjsua2 (added)
• android/app/src/main/java/org/pjsip/pjsua2/app (added)
• android/app/src/main/java/org/pjsip/pjsua2/app/CallActivity.java (added)
• android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java (added)
• android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java (added)
• android/app/src/main/jniLibs (added)
• android/app/src/main/jniLibs/armeabi (added)
• android/app/src/main/res (added)
• android/app/src/main/res/drawable (added)
• android/app/src/main/res/drawable-hdpi (added)
• android/app/src/main/res/drawable-hdpi/ic_launcher.png (added)
• android/app/src/main/res/drawable-mdpi (added)
• android/app/src/main/res/drawable-mdpi/ic_launcher.png (added)
• android/app/src/main/res/drawable-xhdpi (added)
• android/app/src/main/res/drawable-xhdpi/ic_launcher.png (added)
• android/app/src/main/res/drawable-xxhdpi (added)
• android/app/src/main/res/drawable-xxhdpi/ic_launcher.png (added)
• android/app/src/main/res/drawable/bkg.xml (added)
• android/app/src/main/res/layout (added)
• android/app/src/main/res/layout/activity_call.xml (added)
• android/app/src/main/res/layout/activity_main.xml (added)
• android/app/src/main/res/layout/dlg_account_config.xml (added)
• android/app/src/main/res/layout/dlg_add_buddy.xml (added)
• android/app/src/main/res/menu (added)
• android/app/src/main/res/menu/call.xml (added)
• android/app/src/main/res/menu/main.xml (added)
• android/app/src/main/res/values (added)
• android/app/src/main/res/values-sw600dp (added)
• android/app/src/main/res/values-sw600dp/dimens.xml (added)
• android/app/src/main/res/values-sw720dp-land (added)
• android/app/src/main/res/values-sw720dp-land/dimens.xml (added)
• android/app/src/main/res/values-v11 (added)
• android/app/src/main/res/values-v11/styles.xml (added)
• android/app/src/main/res/values-v14 (added)
• android/app/src/main/res/values-v14/styles.xml (added)
• android/app/src/main/res/values/colors.xml (added)
• android/app/src/main/res/values/dimens.xml (added)
• android/app/src/main/res/values/strings.xml (added)
• android/app/src/main/res/values/styles.xml (added)
• android/build.gradle (added)
• android/gradle (added)
• android/gradle/wrapper (added)
• android/gradle/wrapper/gradle-wrapper.jar (added)
• android/gradle/wrapper/gradle-wrapper.properties (added)
• android/gradlew (added)
• android/gradlew.bat (added)
• android/ic_launcher-web.png (deleted)
• android/jni (deleted)
• android/libs (deleted)
• android/proguard-project.txt (deleted)
• android/project.properties (deleted)
• android/res (deleted)
• android/settings.gradle (added)
• android/src (deleted)

pjproject/trunk/pjsip-apps/src/swig/java/Makefile

@@ -22 +22 @@
   else
     ifeq ($(OS),android)
-      LIBPJSUA2_SO=android/libs/armeabi/libpjsua2.so
+      LIBPJSUA2_SO=android/app/src/main/jniLibs/armeabi/libpjsua2.so
     else
       LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so
@@ -150 +150 @@
 MY_PACKAGE_NAME  := org.pjsip.pjsua2
 ifeq ($(OS),android)
-  MY_PACKAGE_PATH  := android/src/$(subst .,/,$(MY_PACKAGE_NAME))
+  MY_PACKAGE_PATH  := android/app/src/main/java/$(subst .,/,$(MY_PACKAGE_NAME))
 else
   MY_PACKAGE_PATH  := $(OUT_DIR)/$(subst .,/,$(MY_PACKAGE_NAME))
 endif
 
-MY_APP_JAVA := android/src/$(subst .,/,$(MY_PACKAGE_NAME))/app/MyApp.java
+MY_APP_JAVA := android/app/src/main/java/$(subst .,/,$(MY_PACKAGE_NAME))/app/MyApp.java
 
 .PHONY: all java install uninstall

pjproject/trunk/pjsip-apps/src/swig/java/android

@@ -1 @@
-bin
-gen
-obj
-assets
-.cproject
+.gradle
+.idea
+build
+android.iml
+local.properties

@@ -1 @@
-bin
-gen
-obj
-assets
-.cproject
+.gradle
+.idea
+build
+android.iml
+local.properties

@@ -1 @@
-bin
-gen
-obj
-assets
-.cproject
+.gradle
+.idea
+build
+android.iml
+local.properties