Merge pull request #528 from hypnosis-i2p/openssl

fixed #519

Tunnel.cpp

@@ -861,6 +861,12 @@ namespace tunnel
 		// TODO: locking
 		return m_OutboundTunnels.size();
 	}
+
+#ifdef ANDROID_ARM7A
+    template std::shared_ptr<InboundTunnel> Tunnels::CreateTunnel<InboundTunnel>(std::shared_ptr<TunnelConfig>, std::shared_ptr<OutboundTunnel>);
+    template std::shared_ptr<OutboundTunnel> Tunnels::CreateTunnel<OutboundTunnel>(std::shared_ptr<TunnelConfig>, std::shared_ptr<OutboundTunnel>);
+#endif
+
 }
 }
 

qt/.gitignore

@@ -1,3 +1 @@
-/build-i2pd_qt-Android_armeabi_v7a_GCC_4_9_Qt_5_6_0-Debug/
+/build*/
-/build-i2pd_qt-Desktop_Qt_5_6_0_GCC_64bit-Debug/
-/build-i2pd_qt-Android_x86_GCC_4_9_Qt_5_6_0-Debug/

qt/i2pd_qt/android/AndroidManifest.xml

@@ -1,22 +1,11 @@
 <?xml version="1.0"?>
-<manifest 
+<manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.8.0" android:versionCode="1" android:installLocation="auto">
-    package="org.purplei2p.i2pd" 
-    xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:versionName="2.8.0" android:versionCode="1" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="24"/>
-	<supports-screens 
+        <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-	    android:largeScreens="true" 
-	    android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
     <!-- <application android:hardwareAccelerated="true" -->
-	<application 
+        <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="i2pd">
-        android:name="org.qtproject.qt5.android.bindings.QtApplication" 
-        android:label="i2pd">
         <!-- android:configChanges="screenSize|smallestScreenSize" are since api 13, "layoutDirection" since api 17 -->
-        <activity 
+        <activity android:configChanges="orientation|uiMode|screenLayout|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.purplei2p.i2pd.I2PDMainActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
-            android:configChanges="orientation|uiMode|screenLayout|locale|fontScale|keyboard|keyboardHidden|navigation" 
-            android:name="org.purplei2p.i2pd.I2PDMainActivity" 
-            android:label="-- %%INSERT_APP_NAME%% --" 
-            android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -60,7 +49,7 @@
             <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
             <!-- auto screen scale factor -->
         </activity>
-        <service android:enabled="true" android:name=".LocalService" />
+        <service android:enabled="true" android:name=".LocalService"/>
     </application>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

qt/i2pd_qt/i2pd_qt.pro

@@ -137,6 +137,7 @@ LIBS += -lz
 android {
 message("Using Android settings")
 DEFINES += ANDROID=1
+DEFINES += __ANDROID__
 INCLUDEPATH +=  $$BOOST_PATH/boost_1_53_0/include \
                 $$OPENSSL_PATH/openssl-1.0.2/include \
                 $$IFADDRS_PATH
@@ -146,6 +147,9 @@ DISTFILES += \
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 equals(ANDROID_TARGET_ARCH, armeabi-v7a){
+
+DEFINES += ANDROID_ARM7A
+
 # http://stackoverflow.com/a/30235934/529442
 LIBS += -L$$BOOST_PATH/boost_1_53_0/armeabi-v7a/lib \
 -lboost_system-gcc-mt-1_53 \