Changeset 5513 for pjproject/branches/projects/uwp/pjsip-apps/src/swig/java/Makefile

Timestamp:

Dec 28, 2016 3:40:07 AM (7 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/swig/java/Makefile (modified) (8 diffs)

pjproject/branches/projects/uwp/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
@@ -127 +127 @@
 MY_JAVA          := "$(JAVA_BIN)/java"
 MY_JAVAC         := "$(JAVA_BIN)/javac"
-MY_JNI_CFLAGS    := -I"$(JAVA_INC)" -I"$(JAVA_INC)/win32" \
+ifneq ($(OS),android)
+  MY_JNI_CFLAGS  := -I"$(JAVA_INC)" -I"$(JAVA_INC)/win32" \
                     -I"$(JAVA_INC)/linux" -I"$(JAVA_INC)/darwin" -I.
-MY_JNI_LDFLAGS   := -L"$(JAVA_LIB)"
+  MY_JNI_LDFLAGS := -L"$(JAVA_LIB)"
+endif
 
 # OS specific
@@ -138 +140 @@
   ifeq ($(OS),android)
     MY_JNI_CFLAGS+= -D__ANDROID__
+    MY_JNI_LDFLAGS+= -Wl,-soname,libpjsua2.so
     SWIG_FLAGS+= -D__ANDROID__
   endif
@@ -147 +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
@@ -159 +162 @@
 
 $(LIBPJSUA2_SO): $(OUT_DIR)/pjsua2_wrap.o
+ifeq ($(OS),android)
+        mkdir -p android/app/src/main/jniLibs/armeabi
+endif
         $(PJ_CXX) -shared -o $(LIBPJSUA2_SO) $(OUT_DIR)/pjsua2_wrap.o \
                 $(MY_CFLAGS) $(MY_LDFLAGS)
@@ -168 +174 @@
 $(OUT_DIR)/pjsua2_wrap.cpp: ../pjsua2.i ../symbols.i $(SRCS)
         mkdir -p $(MY_PACKAGE_PATH)
+        mkdir -p $(OUT_DIR)
         swig $(SWIG_FLAGS) -java  -package $(MY_PACKAGE_NAME) \
                 -outdir $(MY_PACKAGE_PATH) \
@@ -190 +197 @@
 $(MY_PACKAGE_PATH)/sample.class: sample.java
         $(MY_JAVAC) -d $(OUT_DIR) -classpath "$(OUT_DIR)" sample.java
+        @# Build javafx sample app
+        @# $(MY_JAVAC) -d $(OUT_DIR) -classpath "$(OUT_DIR)" sample2.java
 
 test:
@@ -201 +210 @@
         $(MY_JAVA) -cp "$(OUT_DIR)" -Djava.library.path="$(OUT_DIR)" \
                 org.pjsip.pjsua2.app.sample     
+        @# This is for sample2 app
+        @# $(MY_JAVA) -cp "$(OUT_DIR)" -Djava.library.path="$(OUT_DIR)" \
+        @#      org.pjsip.pjsua2.app.sample2            
 
 install: