Skip to content

Commit e5c2056

Browse files
committed
Fix for new location of libsqlcipher.so, and some broken links in Opaque assets.
1 parent 940169f commit e5c2056

10 files changed

+16
-9
lines changed

.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ eclipse_projects/remote-desktop-clients-libs-*.tar.gz
1919

2020
Opaque/jni/libs/deps/
2121
Opaque/jni/libs/tar/
22+
Opaque/gst-build-x86/
23+
Opaque/java/
24+
*/libs/sqlcipher-javadoc.jar
25+
*/libs/sqlcipher.jar
26+
*/libs/*/libgstreamer_android.so
27+
*/libs/*/libspice.so
28+
*/libs/*/libsqlcipher.so
29+
Opaque/src/main/assets/fontconfig/
30+
Opaque/src/main/assets/ssl/
2231
bVNC/debug/
2332
bVNC/gst-build-armeabi-v7a/
2433
bVNC/gst-build-x86/

Opaque/jni/src/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ GSTREAMER_ROOT := $(COMMON_ROOT)/gstreamer
66
# Add prebuilt libraries to avoid deletion.
77
include $(CLEAR_VARS)
88
LOCAL_MODULE := libsqlcipher
9-
LOCAL_SRC_FILES := ../libs/deps/android-database-sqlcipher/libs/$(TARGET_ARCH_ABI)/libsqlcipher.so
9+
LOCAL_SRC_FILES := ../libs/deps/android-database-sqlcipher/jni/libs32/$(TARGET_ARCH_ABI)/libsqlcipher.so
1010
include $(PREBUILT_SHARED_LIBRARY)
1111

1212
include $(CLEAR_VARS)

Opaque/src/main/assets/fontconfig

-1
This file was deleted.

Opaque/src/main/assets/ssl

-1
This file was deleted.

bVNC/AndroidManifest.xml.aRDP

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.iiordanov.aRDP" android:installLocation="auto"
5-
android:versionCode="113990" android:versionName="v3.9.9">
5+
android:versionCode="113992" android:versionName="v3.9.9">
66

77
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"></uses-sdk>
88
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

bVNC/AndroidManifest.xml.aSPICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.iiordanov.aSPICE" android:installLocation="auto"
5-
android:versionCode="113990" android:versionName="v3.9.9">
5+
android:versionCode="113992" android:versionName="v3.9.9">
66

77
<uses-sdk android:minSdkVersion="12" android:targetSdkVersion="21"></uses-sdk>
88
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

bVNC/AndroidManifest.xml.bVNC

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.iiordanov.bVNC" android:installLocation="auto"
5-
android:versionCode="113990" android:versionName="v3.9.9">
5+
android:versionCode="113992" android:versionName="v3.9.9">
66

77
<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="21"></uses-sdk>
88
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

bVNC/AndroidManifest.xml.freeaRDP

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.iiordanov.freeaRDP" android:installLocation="auto"
5-
android:versionCode="113990" android:versionName="v3.9.9">
5+
android:versionCode="113992" android:versionName="v3.9.9">
66

77
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"></uses-sdk>
88
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

bVNC/AndroidManifest.xml.freeaSPICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.iiordanov.freeaSPICE" android:installLocation="auto"
5-
android:versionCode="113990" android:versionName="v3.9.9">
5+
android:versionCode="113992" android:versionName="v3.9.9">
66

77
<uses-sdk android:minSdkVersion="12" android:targetSdkVersion="21"></uses-sdk>
88
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

bVNC/AndroidManifest.xml.freebVNC

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.iiordanov.freebVNC" android:installLocation="auto"
5-
android:versionCode="113990" android:versionName="v3.9.9">
5+
android:versionCode="113992" android:versionName="v3.9.9">
66

77
<uses-sdk android:minSdkVersion="11" android:targetSdkVersion="21"></uses-sdk>
88
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

0 commit comments

Comments
 (0)