Skip to content

Commit db90e76

Browse files
pchabpchab
committed
updated libjingle, switch to socket.io android lib
1 parent 08bfc8a commit db90e76

15 files changed

Lines changed: 185 additions & 541 deletions

‎AndroidRTC.iml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
</content>
1414
<orderEntry type="inheritedJdk" />
1515
<orderEntry type="sourceFolder" forTests="false" />
16-
<orderEntry type="library" name="libs" level="project" />
16+
<orderEntry type="library" name="libjingle" level="project" />
17+
<orderEntry type="library" name="engine.io-client-0.4.1" level="project" />
18+
<orderEntry type="library" name="Java-WebSocket-1.3.0" level="project" />
19+
<orderEntry type="library" name="socket.io-client-0.4.2" level="project" />
1720
</component>
18-
</module>
19-
21+
</module>

‎libs/Java-WebSocket-1.3.0.jar‎

101 KB
Binary file not shown.

‎libs/armeabi/libjingle_peerconnection_so.so‎

2.78 MB
Binary file not shown.

‎libs/engine.io-client-0.4.1.jar‎

99.7 KB
Binary file not shown.

‎libs/lib_android_websockets.jar‎

-49.5 KB
Binary file not shown.

‎libs/libjingle_peerconnection.jar‎

38.4 KB
Binary file not shown.

‎libs/socket.io-client-0.4.2.jar‎

59.6 KB
Binary file not shown.

‎project.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# This file is automatically generated by IntelliJ IDEA
22
# Project target.
3-
target=android-17
3+
dex.disable.merger=true
4+
target=android-22

‎res/layout/main.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:orientation="vertical"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent">
6+
7+
<android.opengl.GLSurfaceView
8+
android:id="@+id/glview_call"
9+
android:layout_width="match_parent"
10+
android:layout_height="match_parent" />
11+
12+
</RelativeLayout>

‎res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">AndroidRTC</string>
4-
<string name="host">172.20.102.34</string>
4+
<string name="host">192.168.0.2</string>
55
<string name="port">3000</string>
66
</resources>

0 commit comments

Comments
 (0)