only build router once

- Update JNI build script to use GCC 4.6, required for
   NDK r9b and higher (ticket #1202)
 - Add more checks in build script, to fail quicker on problems
 - Move default NDK build location up one directory level
 - Fix setting JAVA_HOME
 - Fixes for running script in the directory

 I did not replace the checked-in 4.4.3 libjbigi.so with
 the new 4.6 version, as there's no need.
 The 4.6 version will be tested by nextloop in the F-Droid build.

.tx/config

@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = ru_RU: ru, sv_SE: sv, tr_TR: tr, zh_CN: zh
+lang_map = pt_BR: pt-rBR, ru_RU: ru, sv_SE: sv, tr_TR: tr, zh_CN: zh
 
 [I2P.android]
 file_filter = res/values-<lang>/strings.xml

AndroidManifest.xml.in

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-sdk android:minSdkVersion="8"
-              android:targetSdkVersion="18" />
+              android:targetSdkVersion="19" />
 
     <application android:label="@string/app_name"
                android:theme="@style/Theme.AppCompat"

README.txt

@@ -14,7 +14,7 @@ Dependencies:
 - Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
 - Apache Ant 1.8.0 or higher
 - I2P source in ../i2p.i2p
-- Android SDK (tested with Rev 20 and platform-tools version 12)
+- Android SDK (tested with Rev 22.3 and platform-tools version 19)
 
 =====================
 
@@ -29,15 +29,18 @@ Instructions:
 
 # now go to the available packages tab, check the box and click refresh,
 # and download an SDK Platform
-# Since I2P is targeted at 4.3 (API 18)
+# Since I2P is targeted at 4.4 (API 19)
 # download at least that one. Otherwise you must change the
-# target in project.properties from android-18 to andriod-x
+# target in project.properties from android-19 to andriod-x
 # where x is the API version.
 
 # I2P is configured to run on 2.2 (API 8) or higher using the
 # Android Support Library, so download that as well
 # (it's under "Extras"). 
 
+# update the compatibility project
+../android-sdk-linux/tools/android update lib-project -p ../android-sdk-linux/extras/android/support/v7/appcompat -t android-19
+
 # To run the debugger (ddms) you also need to download the
 # "Android SDK Platform-Tools" package from the GUI updater.
 
@@ -55,9 +58,9 @@ Instructions:
 
 # DO NOT create a new project or anything. It's all set up right here for you.
 
-# Create the android 4.3 (API 18) virtual device
+# Create the android 4.4 (API 19) virtual device
 # (don't make a custom hardware profile)
-../android-sdk-linux/tools/android create avd --name i2p --target 18
+../android-sdk-linux/tools/android create avd --name i2p --target android-19
 
 # then run the emulator:
 #  This may take a LONG time the first time (half an hour or more)...

custom_rules.xml

@@ -364,17 +364,6 @@
     <property name="version.name" value="${my.version.name}" />
     <echo message="version.code '${version.code}', 'version.name '${version.name}', '${my.version.name}'" />
 
-    <!-- If we are missing any jars, we _MUST_ make them ahead of time so
-	 the build does not fail! _HOWEVER_ we must only do this if we are
-	 _BUILDING_! Apache Ant does not allow us to know what target we are
-	 about to run, because the authors believe it is 'evil' and other
-	 nonsense. So for now (so sorry!) we force build it ahead of time
-	 always, no matter what target was selected, until some better way
-	 of resolving this issue apears.
-    -->
-    <ant dir="routerjars" inheritall="false" useNativeBasedir="true" >
-	<target name="buildrouter" />
-    </ant>
     <!--
          ================================================================================
          New I2P rules
@@ -394,12 +383,9 @@
     <!-- overrides of those in main_rules.xml -->
 
     <target name="-pre-build" depends="copy-i2p-resources" >
-        <!-- aapt messes up when resources are added or deleted, just build every time
-        <delete dir="${gen.absolute.dir}/net" verbose="${verbose}" />
-         -->
-        <!-- screw it, do the classes too, until I add the depend class
-        <delete dir="${out.absolute.dir}/classes/net" verbose="${verbose}" />
-        -->
+        <ant dir="routerjars" inheritall="false" useNativeBasedir="true" >
+            <target name="buildrouter" />
+        </ant>
     </target>
 
 <!--
@@ -423,17 +409,8 @@
         <copy file="LICENSE.txt" tofile="res/raw/license_app_txt" />
         <copy file="licenses/LICENSE-Apache2.0.txt" tofile="res/raw/license_apache20_txt" />
         <copy file="${i2pbase}/installer/resources/themes/console/images/i2plogo.png" todir="res/drawable/" />
-	<!-- 
-	
-	No, no, no. Wrong, wrong, wrong. Static web sources should be in
-        the assets directory. 
-        
-        <copy file="${i2pbase}/installer/resources/themes/console/images/outbound.png" todir="res/drawable/" />
-        <copy file="${i2pbase}/installer/resources/themes/console/images/inbound.png" todir="res/drawable/" />
-        <copy file="${i2pbase}/installer/resources/themes/console/light/images/header.png" todir="res/drawable/" />
-        <copy file="${i2pbase}/installer/resources/themes/console/light/console.css" tofile="res/drawable/console_css" />
-        -->
-        
+
+        <!-- Static web sources should be in the assets directory.  -->
         <copy file="${i2pbase}/installer/resources/themes/console/images/i2plogo.png" todir="assets/themes/console/images/" />
         <copy file="${i2pbase}/installer/resources/themes/console/images/outbound.png" todir="assets/themes/console/images/" />
         <copy file="${i2pbase}/installer/resources/themes/console/images/inbound.png" todir="assets/themes/console/images/" />
@@ -493,13 +470,14 @@
         <delete file="res/raw/license_gplv2_txt" />
         <delete file="res/raw/license_gplv3_txt" />
         <delete file="res/raw/license_lgplv3_txt" />
+        <delete file="res/raw/license_fatcowicons_txt" />
         <delete file="res/raw/certificates_zip" />
     </target>
 
     <target name="distclean" depends="clean">
-    	<ant dir="routerjars" inheritall="false" useNativeBasedir="true" >
-    		<target name="distclean" />
-    	</ant>
+        <ant dir="routerjars" inheritall="false" useNativeBasedir="true" >
+            <target name="distclean" />
+        </ant>
         <delete file="scripts/build.number" verbose="${verbose}" />
         <delete file="scripts/version.properties" verbose="${verbose}" />
         <delete file="AndroidManifest.xml" verbose="${verbose}" />

project.properties

@@ -8,7 +8,7 @@
 # project structure.
 
 # Project target.
-target=android-18
+target=android-19
 # Must match that in AndroidManifest.xml.in
 minSdkVersion=8
 # I2P router libs

res/values-de/strings.xml

@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Willkommen zu I2P! Diese App ist eine Alpha-Software und bietet keine starke Anonymität. Bitte lies die Bekanntmachung zur Veröffentlichung und der Lizenzeninformation.</string>
+  <string name="welcome_new_version">Neue Version installiert. Bitte lies die Hinweise zur Veröffentlichung. Version:</string>
+  <string name="label_home">I2P Home</string>
+  <string name="label_statistics">Statistiken</string>
+  <string name="label_main_controls">Haupteinstellungen</string>
+  <string name="label_tools">I2P Werkzeuge</string>
+  <string name="label_addressbook">Adressbuch</string>
+  <string name="label_logs">Protokolle</string>
+  <string name="label_error_logs">Fehler Protokolle</string>
+  <string name="label_info_and_pages">Informationen und Seiten</string>
+  <string name="label_welcome_page">Willkommen Seite</string>
+  <string name="label_news">Neuigkeiten</string>
+  <string name="label_news_status">Neuste I2P Nachrichten</string>
+  <string name="label_peers_status">Netzwerke</string>
+  <string name="label_release_notes">Hinweise zu Veröffentlichungen</string>
+  <string name="label_licenses">Lizenzen</string>
+  <string name="label_nonanon_info">Nicht anonyme Informationen</string>
+  <string name="label_website_nonanon">Webseite (nicht anonym)</string>
+  <string name="label_faq_nonanon">FAQ (nicht anonym)</string>
+  <string name="action_add">Hinzufügen</string>
+  <string name="action_router_start">Router starten</string>
+  <string name="action_router_stop">Router stoppen</string>
+  <string name="action_reload">Neu laden</string>
+  <string name="menu_settings">Einstellungen</string>
+  <string name="settings_enable">Einschlaten</string>
+  <string name="settings_label_subscriptions">I2P Adressbuch</string>
+  <string name="settings_desc_subscriptions">abonnierte URLs</string>
+  <string name="settings_label_bandwidth">Bandbreite und Netzwerk</string>
+  <string name="settings_label_bw_inbound">ankommende Geschwindigkeit</string>
+  <string name="settings_desc_bw_inbound">maximal angekommende Geschwindigkeit</string>
+  <string name="settings_label_bw_outbound">ausgehende Geschwindigkeit</string>
+  <string name="settings_desc_bw_outbound">maximal ausgehende Geschwindigkeit</string>
+  <string name="settings_label_hiddenMode">Beteiligung</string>
+  <string name="settings_desc_hiddenMode">\"Versteckt Modus\" ausschalten</string>
+  <string name="settings_label_maxPartTunnels">maximal teilnehmende Tunnel</string>
+  <string name="settings_desc_maxPartTunnels">Maximum an Tunneln zum teilnehmen (Standard=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Maximum an Tunneln zum teilnehmen</string>
+  <string name="settings_label_sharePercent">tausche Prozente</string>
+  <string name="settings_desc_sharePercent">Prozentsatz der Bandbreite zum tauschen (Standard=80)</string>
+  <string name="settings_dialog_sharePercent">Prozentsatz der Bandbreite zum tauschen</string>
+  <string name="settings_desc_upnp">Firewallports automatisch öffnen</string>
+  <string name="settings_label_advanced">Erweitert</string>
+  <string name="settings_label_transports">Transporte</string>
+  <string name="settings_label_maxConns">max. Verbindungen</string>
+  <string name="settings_label_i2cp">I2CP Benutzerinterface</string>
+  <string name="settings_desc_i2cp">lausche auf Port 7654</string>
+  <string name="settings_label_exploratory_pool">Informationspool</string>
+  <string name="settings_desc_exploratory_pool">Tunnel Parameter</string>
+  <string name="settings_label_expl_inbound">eingehende Tunnel</string>
+  <string name="settings_label_expl_outbound">ausgehende Tunnel</string>
+  <string name="settings_label_expl_length">Länge</string>
+  <string name="settings_desc_expl_length">Wie viele Hops zum benutzen</string>
+  <string name="settings_label_expl_lengthVariance">Hop Abweichung</string>
+  <string name="settings_desc_expl_lengthVariance">Wie viele Hops zufällig hinzufügt werden</string>
+  <string name="settings_label_expl_quantity">Menge</string>
+  <string name="settings_desc_expl_quantity">Wie viele Tunnel</string>
+  <string name="settings_label_expl_backupQuantity">Sicherungsmenge</string>
+  <string name="settings_desc_expl_backupQuantity">Wie viele Tunnelsicherungen</string>
+</resources>

res/values-es/strings.xml

@@ -9,7 +9,7 @@
   <string name="label_tools">Herramientas de I2P</string>
   <string name="label_addressbook">Libreta de direcciones</string>
   <string name="label_logs">Registros</string>
-  <string name="label_error_logs">Registros de Errores</string>
+  <string name="label_error_logs">Registro de Errores</string>
   <string name="label_info_and_pages">Información y páginas</string>
   <string name="label_welcome_page">Página de Bienvenida</string>
   <string name="label_news">Noticias</string>
@@ -26,13 +26,13 @@
   <string name="action_reload">Recargar</string>
   <string name="menu_settings">Preferencias</string>
   <string name="settings_enable">Activar</string>
-  <string name="settings_label_subscriptions">Librete de direcciones I2P</string>
+  <string name="settings_label_subscriptions">Libreta de direcciones I2P</string>
   <string name="settings_desc_subscriptions">URLs de subscripción</string>
   <string name="settings_label_bandwidth">Red y ancho de banda</string>
-  <string name="settings_label_bw_inbound">Velocidad de entrada</string>
-  <string name="settings_desc_bw_inbound">Velocidad máxima de entrada</string>
-  <string name="settings_label_bw_outbound">Velocidad de salida</string>
-  <string name="settings_desc_bw_outbound">Velocidad máxima de salida</string>
+  <string name="settings_label_bw_inbound">Velocidad de descarga</string>
+  <string name="settings_desc_bw_inbound">Velocidad máxima de descarga</string>
+  <string name="settings_label_bw_outbound">Velocidad de subida</string>
+  <string name="settings_desc_bw_outbound">Velocidad máxima de subida</string>
   <string name="settings_label_hiddenMode">Participación</string>
   <string name="settings_desc_hiddenMode">Desactivar modo oculto</string>
   <string name="settings_label_maxPartTunnels">Máximo número de túneles participantes</string>
@@ -43,11 +43,11 @@
   <string name="settings_dialog_sharePercent">Procentaje del ancho de banda a compartir</string>
   <string name="settings_desc_upnp">Abrir los puertos del cortafuegos automáticamente</string>
   <string name="settings_label_advanced">Avanzado</string>
-  <string name="settings_label_transports">Trnasportes</string>
+  <string name="settings_label_transports">Transportes</string>
   <string name="settings_label_maxConns">Máximo número de conexiones</string>
   <string name="settings_label_i2cp">Interfaz de I2CP</string>
   <string name="settings_desc_i2cp">Escuchar en el puerto 7654</string>
-  <string name="settings_label_exploratory_pool">Grupo exploratiorio</string>
+  <string name="settings_label_exploratory_pool">Grupo exploratorio</string>
   <string name="settings_desc_exploratory_pool">Parámetros del Túnel</string>
   <string name="settings_label_expl_inbound">Túneles de entrada</string>
   <string name="settings_label_expl_outbound">Túneles de salida</string>

res/values-it/strings.xml

@@ -1,6 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Benvenuto su I2P! Questa app è software in versione ALFA e non fornisce un anonimato robusto. Leggi le note di rilascio e le informazioni sulla licenza.</string>
+  <string name="welcome_new_version">Nuova versione installata. Leggi le note di rilascio. Versione:</string>
   <string name="label_home">I2P Home</string>
   <string name="label_statistics">Statistiche</string>
   <string name="label_main_controls">Controlli principali</string>
@@ -31,4 +33,30 @@
   <string name="settings_desc_bw_inbound">Velocità massima in entrata</string>
   <string name="settings_label_bw_outbound">Velocità in uscita</string>
   <string name="settings_desc_bw_outbound">Velocità massima in uscita</string>
+  <string name="settings_label_hiddenMode">Partecipazione</string>
+  <string name="settings_desc_hiddenMode">Spegni la modalità nascosta</string>
+  <string name="settings_label_maxPartTunnels">Limite tunnel partecipanti</string>
+  <string name="settings_desc_maxPartTunnels">Limite tunnel a cui partecipare (predefinito=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Limite tunnel a cui partecipare in</string>
+  <string name="settings_label_sharePercent">Percentuale di condivisione</string>
+  <string name="settings_desc_sharePercent">Percentuale di banda da condividiere (predefinita=80)</string>
+  <string name="settings_dialog_sharePercent">Percentuale di banda da condividere</string>
+  <string name="settings_desc_upnp">Apri automaticamente le porte sul firewall</string>
+  <string name="settings_label_advanced">Avanzato</string>
+  <string name="settings_label_transports">Trasporti</string>
+  <string name="settings_label_maxConns">Limite connessioni</string>
+  <string name="settings_label_i2cp">Interfaccia I2CP</string>
+  <string name="settings_desc_i2cp">Ascolta sulla porta 7654</string>
+  <string name="settings_label_exploratory_pool">Esplorazione pool</string>
+  <string name="settings_desc_exploratory_pool">Parametri tunnel</string>
+  <string name="settings_label_expl_inbound">Tunnel in ingresso</string>
+  <string name="settings_label_expl_outbound">Tunnel in uscita</string>
+  <string name="settings_label_expl_length">Lunghezza</string>
+  <string name="settings_desc_expl_length">Quantità di hop da usare</string>
+  <string name="settings_label_expl_lengthVariance">Varianza hop</string>
+  <string name="settings_desc_expl_lengthVariance">Quantità di hop da aggiungere a caso</string>
+  <string name="settings_label_expl_quantity">Quantità</string>
+  <string name="settings_desc_expl_quantity">Quantità di tunnel</string>
+  <string name="settings_label_expl_backupQuantity">Quantità di backup</string>
+  <string name="settings_desc_expl_backupQuantity">Quantità di backup di tunnel</string>
 </resources>

res/values-ja/strings.xml

@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">I2P へようこそ！このアプリはアルファ版のソフトウェアであり、強い匿名性を提供いたしません。リリース・ノート及びライセンス情報をご覧ください。</string>
+  <string name="welcome_new_version">新しいバージョンがインストールされました。リリース・ノートをご覧ください。バージョン:</string>
+  <string name="label_home">I2P ホーム</string>
+  <string name="label_statistics">統計</string>
+  <string name="label_main_controls">メインコントロール</string>
+  <string name="label_tools">I2P ツール</string>
+  <string name="label_addressbook">アドレス帳</string>
+  <string name="label_logs">ログ</string>
+  <string name="label_error_logs">エラーログ</string>
+  <string name="label_info_and_pages">情報とページ</string>
+  <string name="label_welcome_page">ウェルカムページ</string>
+  <string name="label_news">ニュース</string>
+  <string name="label_news_status">最新の I2P のニュース</string>
+  <string name="label_peers_status">ピア</string>
+  <string name="label_release_notes">リリース・ノート</string>
+  <string name="label_licenses">ライセンス</string>
+  <string name="label_nonanon_info">非匿名の情報</string>
+  <string name="label_website_nonanon">ウェブサイト (非匿名)</string>
+  <string name="label_faq_nonanon">FAQ (非匿名)</string>
+  <string name="action_add">追加</string>
+  <string name="action_router_start">ルーターを開始</string>
+  <string name="action_router_stop">ルーターを停止</string>
+  <string name="action_reload">再読み込み</string>
+  <string name="menu_settings">設定</string>
+  <string name="settings_enable">有効</string>
+  <string name="settings_label_subscriptions">I2P アドレス帳</string>
+  <string name="settings_desc_subscriptions">URL を登録</string>
+  <string name="settings_label_bandwidth">帯域幅とネットワーク</string>
+  <string name="settings_label_bw_inbound">受信速度</string>
+  <string name="settings_desc_bw_inbound">最大受信速度</string>
+  <string name="settings_label_bw_outbound">送信速度</string>
+  <string name="settings_desc_bw_outbound">最大送信速度</string>
+  <string name="settings_label_hiddenMode">参加</string>
+  <string name="settings_desc_hiddenMode">ヒドゥン・モードを切る</string>
+  <string name="settings_label_maxPartTunnels">最大参加トンネル数</string>
+  <string name="settings_desc_maxPartTunnels">参加するトンネルの最大数 (既定=20)</string>
+  <string name="settings_dialog_maxPartTunnels">参加するトンネルの最大数</string>
+  <string name="settings_label_sharePercent">共有割合</string>
+  <string name="settings_desc_sharePercent">共有する帯域幅の割合 (既定=80)</string>
+  <string name="settings_dialog_sharePercent">共有する帯域幅の割合</string>
+  <string name="settings_desc_upnp">自動的にファイアーウォールのポートを開く</string>
+  <string name="settings_label_advanced">高度</string>
+  <string name="settings_label_transports">トランスポート</string>
+  <string name="settings_label_maxConns">最大接続数</string>
+  <string name="settings_label_i2cp">I2CP インターフェース</string>
+  <string name="settings_desc_i2cp">7654番ポートでリッスン</string>
+  <string name="settings_label_exploratory_pool">予備プール</string>
+  <string name="settings_desc_exploratory_pool">トンネルパラーメーター</string>
+  <string name="settings_label_expl_inbound">受信トンネル</string>
+  <string name="settings_label_expl_outbound">送信トンネル</string>
+  <string name="settings_label_expl_length">長さ</string>
+  <string name="settings_desc_expl_length">使用するホップの回数</string>
+  <string name="settings_label_expl_lengthVariance">ホップ分散</string>
+  <string name="settings_desc_expl_lengthVariance">ホップをランダムに追加する回数</string>
+  <string name="settings_label_expl_quantity">数量</string>
+  <string name="settings_desc_expl_quantity">トンネルの数</string>
+  <string name="settings_label_expl_backupQuantity">バックアップの数量</string>
+  <string name="settings_desc_expl_backupQuantity">トンネルバックアップの数</string>
+</resources>

res/values-ko/strings.xml

@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">I2P에 환영합니다! 이 앱은 알파 소프트웨어이며 강력한 익명성을 제공하지 않습니다. 릴리즈 노트나 라이센스 정보를 참조하세요.</string>
+  <string name="welcome_new_version">새 버전이 설치되었습니다. 릴리즈 노트를 읽어주세요. 버전:</string>
+  <string name="label_home">I2P 홈</string>
+  <string name="label_statistics">통계</string>
+  <string name="label_main_controls">메인 컨트롤</string>
+  <string name="label_tools">I2P 도구</string>
+  <string name="label_addressbook">주소록</string>
+  <string name="label_logs">로그</string>
+  <string name="label_error_logs">오류 로그</string>
+  <string name="label_info_and_pages">정보와 페이지</string>
+  <string name="label_welcome_page">환영 페이지</string>
+  <string name="label_news">뉴스</string>
+  <string name="label_news_status">최신 I2P 뉴스</string>
+  <string name="label_peers_status">피어</string>
+  <string name="label_release_notes">릴리즈 노트</string>
+  <string name="label_licenses">라이센스</string>
+  <string name="label_nonanon_info">비 익명 정보</string>
+  <string name="label_website_nonanon">웹 사이트 (비익명)</string>
+  <string name="label_faq_nonanon">FAQ (비익명)</string>
+  <string name="action_add">추가</string>
+  <string name="action_router_start">라우터 시작</string>
+  <string name="action_router_stop">라우터 정지</string>
+  <string name="action_reload">다시 읽기</string>
+  <string name="menu_settings">설정</string>
+  <string name="settings_enable">활성화</string>
+  <string name="settings_label_subscriptions">I2P 주소록</string>
+  <string name="settings_desc_subscriptions">구독 URL들</string>
+  <string name="settings_label_bandwidth">대역폭과 네트워크</string>
+  <string name="settings_label_bw_inbound">수신 속도</string>
+  <string name="settings_desc_bw_inbound">최대 수신 속도</string>
+  <string name="settings_label_bw_outbound">송신 속도</string>
+  <string name="settings_desc_bw_outbound">최대 송신 속도</string>
+  <string name="settings_label_hiddenMode">참가</string>
+  <string name="settings_desc_hiddenMode">히든 모드 끄기</string>
+  <string name="settings_label_maxPartTunnels">최대 참가 터널 수</string>
+  <string name="settings_desc_maxPartTunnels">최대로 참가할 터널 수 (기본값=20)</string>
+  <string name="settings_dialog_maxPartTunnels">최대로 참가할 터널 수</string>
+  <string name="settings_label_sharePercent">공유 비율</string>
+  <string name="settings_desc_sharePercent">공유할 대역폭의 비율 (기본=80)</string>
+  <string name="settings_dialog_sharePercent">공유할 대역폭의 비율</string>
+  <string name="settings_desc_upnp">자동으로 방화벽 포트 열기</string>
+  <string name="settings_label_advanced">고급</string>
+  <string name="settings_label_transports">트랜스포트</string>
+  <string name="settings_label_maxConns">최대 접속 수</string>
+  <string name="settings_label_i2cp">I2CP 인터페이스</string>
+  <string name="settings_desc_i2cp">7654 포트로 수신</string>
+  <string name="settings_label_exploratory_pool">예비 풀</string>
+  <string name="settings_desc_exploratory_pool">터널 파라미터</string>
+  <string name="settings_label_expl_inbound">수신 터널</string>
+  <string name="settings_label_expl_outbound">송신 터널</string>
+  <string name="settings_label_expl_length">길이</string>
+  <string name="settings_desc_expl_length">사용하는 홉의 수</string>
+  <string name="settings_label_expl_lengthVariance">홉 분산</string>
+  <string name="settings_desc_expl_lengthVariance">랜덤으로 추가할 홉의 수</string>
+  <string name="settings_label_expl_quantity">수량</string>
+  <string name="settings_desc_expl_quantity">터널의 수</string>
+  <string name="settings_label_expl_backupQuantity">백업된 수량</string>
+  <string name="settings_desc_expl_backupQuantity">터널 백업의 수</string>
+</resources>

res/values-nl/strings.xml

@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Welkom op I2P! Deze app heeft de ALPHA status en het biedt geen sterke anonimiteit. Lees de releaseopmerkingen en licentie-informatie.</string>
+  <string name="welcome_new_version">Nieuwe versie geïnstalleerd. Lees de releaseopmerkingen. Versie:</string>
+  <string name="label_home">I2P-startpagina</string>
+  <string name="label_statistics">Statistieken</string>
+  <string name="label_main_controls">Belangrijkste functies</string>
+  <string name="label_tools">I2P-hulpmiddelen</string>
+  <string name="label_addressbook">Adresboek</string>
+  <string name="label_logs">Logboeken</string>
+  <string name="label_error_logs">Foutenlogs</string>
+  <string name="label_info_and_pages">Informatie en pagina\'s</string>
+  <string name="label_welcome_page">Welkomspagina</string>
+  <string name="label_news">Nieuws</string>
+  <string name="label_news_status">Laatste I2P-nieuws</string>
+  <string name="label_peers_status">Peers</string>
+  <string name="label_release_notes">Versieopmerkingen</string>
+  <string name="label_licenses">Licenties</string>
+  <string name="label_nonanon_info">Niet-anonieme informatie</string>
+  <string name="label_website_nonanon">Website (niet anoniem)</string>
+  <string name="label_faq_nonanon">Veelgestelde vragen (niet anoniem)</string>
+  <string name="action_add">Toevoegen</string>
+  <string name="action_router_start">Router starten</string>
+  <string name="action_router_stop">Router stoppen</string>
+  <string name="action_reload">Opnieuw laden</string>
+  <string name="menu_settings">Instellingen</string>
+  <string name="settings_enable">Inschakelen</string>
+  <string name="settings_label_subscriptions">I2P-adresboek</string>
+  <string name="settings_desc_subscriptions">URL\'s van abbonementen</string>
+  <string name="settings_label_bandwidth">Bandbreedte en netwerk</string>
+  <string name="settings_label_bw_inbound">Binnenkomende snelheid</string>
+  <string name="settings_desc_bw_inbound">Maximale binnenkomende snelheid</string>
+  <string name="settings_label_bw_outbound">Uitgaande snelheid</string>
+  <string name="settings_desc_bw_outbound">Maximale uitgaande snelheid</string>
+  <string name="settings_label_hiddenMode">Deelname</string>
+  <string name="settings_desc_hiddenMode">Verborgen modus uitschakelen</string>
+  <string name="settings_label_maxPartTunnels">Maximale deelnemende tunnels</string>
+  <string name="settings_desc_maxPartTunnels">Maximaal aantal tunnels om aan deel te nemen (standaard=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Maximaal aantal tunnels om aan deel te nemen</string>
+  <string name="settings_label_sharePercent">Percentage delen</string>
+  <string name="settings_desc_sharePercent">Het te delen percentage van de bandbreedte (standaard=80)</string>
+  <string name="settings_dialog_sharePercent">Het te delen percentage van de bandbreedte</string>
+  <string name="settings_desc_upnp">Automatisch firewall-poorten openen</string>
+  <string name="settings_label_advanced">Geavanceerd</string>
+  <string name="settings_label_transports">Transporten</string>
+  <string name="settings_label_maxConns">Maximale connecties</string>
+  <string name="settings_label_i2cp">I2CP-interface</string>
+  <string name="settings_desc_i2cp">Luister op poort 7654</string>
+  <string name="settings_label_exploratory_pool">Verkennende-pool</string>
+  <string name="settings_desc_exploratory_pool">Tunnelparameters</string>
+  <string name="settings_label_expl_inbound">Inkomende tunnels</string>
+  <string name="settings_label_expl_outbound">Uitgaande tunnels</string>
+  <string name="settings_label_expl_length">Lengte</string>
+  <string name="settings_desc_expl_length">Hoeveel \'hops\' te gebruiken</string>
+  <string name="settings_label_expl_lengthVariance">\'Hop\'-variantie</string>
+  <string name="settings_desc_expl_lengthVariance">Hoeveel willekeurig toe te voegen \'hops\'</string>
+  <string name="settings_label_expl_quantity">Hoeveelheid</string>
+  <string name="settings_desc_expl_quantity">Aantal tunnels</string>
+  <string name="settings_label_expl_backupQuantity">Back-up hoeveelheid</string>
+  <string name="settings_desc_expl_backupQuantity">Hoeveel tunnel back-ups</string>
+</resources>

res/values-pl/strings.xml

@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Witamy w I2P! Ta aplikacja jest w fazie ALPHA i nie zapewnia mocnej anonimowości. Zalecamy zapoznanie się z listą zmian i licencją. </string>
+  <string name="welcome_new_version">Nowa wersja zainstalowana. Przeczytaj listę zmian. Wersja:</string>
+  <string name="label_home">I2P Home</string>
+  <string name="label_statistics">Statystyki</string>
+  <string name="label_main_controls">Główna Konsola</string>
+  <string name="label_tools">Narzędzia I2P</string>
+  <string name="label_addressbook">Książka adresowa</string>
+  <string name="label_logs">Logi</string>
+  <string name="label_error_logs">Rejestr błędów</string>
+  <string name="label_info_and_pages">Informacje i strony</string>
+  <string name="label_welcome_page">Strona Powitalna</string>
+  <string name="label_news">Wiadomości</string>
+  <string name="label_news_status">Najnowsze wiadomości o I2P</string>
+  <string name="label_peers_status">Peery</string>
+  <string name="label_release_notes">Informacje o wydaniu</string>
+  <string name="label_licenses">Licencje</string>
+  <string name="label_nonanon_info">Nie Anonimowe Informacje</string>
+  <string name="label_website_nonanon">Strona (nie anonimowa)</string>
+  <string name="label_faq_nonanon">FAQ (nie anonimowa)</string>
+  <string name="action_add">Dodaj</string>
+  <string name="action_router_start">Uruchom Router</string>
+  <string name="action_router_stop">Zatrzymaj Router</string>
+  <string name="action_reload">Przeładuj</string>
+  <string name="menu_settings">Ustawienia</string>
+  <string name="settings_enable">Włącz</string>
+  <string name="settings_label_subscriptions">Książka adresowa I2P</string>
+  <string name="settings_desc_subscriptions">Adresy URL subskrypcji</string>
+  <string name="settings_label_bandwidth">Przepustowość i Sieć</string>
+  <string name="settings_label_bw_inbound">Prędkość przychodząca</string>
+  <string name="settings_desc_bw_inbound">Maksymalna prędkość przychodząca</string>
+  <string name="settings_label_bw_outbound">Prędkość wychodząca</string>
+  <string name="settings_desc_bw_outbound">Maksymalna prędkość wychodząca</string>
+  <string name="settings_label_hiddenMode">Uczestnictwo</string>
+  <string name="settings_desc_hiddenMode">Wyłącz tryp ukryty</string>
+  <string name="settings_label_maxPartTunnels">Maksymalna liczba uczestniczących tuneli</string>
+  <string name="settings_desc_maxPartTunnels">Maksaymalna liczba tuneli uczestniczących w (domyślne=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Maksymalna liczba tuneli uczestniczących w</string>
+  <string name="settings_label_sharePercent">Udział procentowy</string>
+  <string name="settings_desc_sharePercent">Udział procentowy przepustowości do podzielenia (domyślne=80)</string>
+  <string name="settings_dialog_sharePercent">Procent przepustowości do podziału</string>
+  <string name="settings_desc_upnp">Otwórz porty firewall\'a automatycznie</string>
+  <string name="settings_label_advanced">Zaawansowane</string>
+  <string name="settings_label_transports">Transporty</string>
+  <string name="settings_label_maxConns">Maksymalna liczba połączeń</string>
+  <string name="settings_label_i2cp">Interfejs I2CP</string>
+  <string name="settings_desc_i2cp">Słuchaj na porcie 7654</string>
+  <string name="settings_label_exploratory_pool">Pole rozpoznawcze</string>
+  <string name="settings_desc_exploratory_pool">Parametry tuneli</string>
+  <string name="settings_label_expl_inbound">Tunele przychodzące</string>
+  <string name="settings_label_expl_outbound">Tunele wychodzące</string>
+  <string name="settings_label_expl_length">Długość</string>
+  <string name="settings_desc_expl_length">Ile użyć skoków</string>
+  <string name="settings_label_expl_lengthVariance">Wariancje skoków</string>
+  <string name="settings_desc_expl_lengthVariance">Ile skoków losowych dodać</string>
+  <string name="settings_label_expl_quantity">Ilość</string>
+  <string name="settings_desc_expl_quantity">Ile tunelów</string>
+  <string name="settings_label_expl_backupQuantity">Ilość kopii zapasowych</string>
+  <string name="settings_desc_expl_backupQuantity">Ilość kopii zapasowych tuneli</string>
+</resources>

res/values-pt-rBR/strings.xml

@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="label_home">I2P - Página inicial</string>
+  <string name="label_statistics">Estatísticas</string>
+  <string name="label_main_controls">Principais controles</string>
+  <string name="label_tools">I2P - Ferramentas</string>
+  <string name="label_addressbook">Livro de endereços</string>
+  <string name="label_logs">Registros</string>
+  <string name="label_error_logs">Registros de erros</string>
+  <string name="label_welcome_page">Página de boas-vindas</string>
+  <string name="label_news">Novidades</string>
+  <string name="label_news_status">Últimas notícias sobre a I2P</string>
+  <string name="label_peers_status">Nós</string>
+  <string name="label_release_notes">Comunicados de lançamento</string>
+  <string name="label_licenses">Licenças</string>
+  <string name="label_nonanon_info">Informação não-anônima</string>
+  <string name="action_add">Adicionar</string>
+  <string name="action_router_start">Iniciar roteamento</string>
+  <string name="action_router_stop">Interrompear roteamento</string>
+  <string name="action_reload">Recarregar</string>
+  <string name="menu_settings">Especificações</string>
+  <string name="settings_label_subscriptions">Livro de endereços da I2P</string>
+  <string name="settings_label_bandwidth">Rede e Largura de banda</string>
+  <string name="settings_label_hiddenMode">Participação</string>
+  <string name="settings_label_sharePercent">Percentual de compartilhamento</string>
+  <string name="settings_desc_sharePercent">Percentual da largura de banda compartilhada (por omissão=80)</string>
+  <string name="settings_label_advanced">Avançado</string>
+  <string name="settings_label_maxConns">Número máximo de conexões</string>
+  <string name="settings_label_i2cp">Interface do I2CP</string>
+  <string name="settings_desc_i2cp">Ouvindo na porta 7654</string>
+  <string name="settings_label_expl_inbound">Túneis entrantes</string>
+  <string name="settings_label_expl_length">Comprimento</string>
+  <string name="settings_label_expl_quantity">Quantidade</string>
+  <string name="settings_desc_expl_quantity">Quantos túneis</string>
+</resources>

res/values-pt/strings.xml

@@ -28,7 +28,35 @@
   <string name="settings_enable">Habilitar</string>
   <string name="settings_label_subscriptions">Endereços I2P</string>
   <string name="settings_desc_subscriptions">Subscrição de URLs</string>
+  <string name="settings_label_bandwidth">Largura de banda e rede</string>
+  <string name="settings_label_bw_inbound">Velocidade de entrada</string>
+  <string name="settings_desc_bw_inbound">Máxima velocidade de entrada</string>
+  <string name="settings_label_bw_outbound">Velocidade de saída</string>
+  <string name="settings_desc_bw_outbound">Máxima velocidade de saída</string>
   <string name="settings_label_hiddenMode">Participação</string>
+  <string name="settings_desc_hiddenMode">Desligar modo escondido</string>
+  <string name="settings_label_maxPartTunnels">Nº máximo de túneis participantes</string>
+  <string name="settings_desc_maxPartTunnels">Máximo de túneis para participar (padrão=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Máximo de túneis para participar</string>
+  <string name="settings_label_sharePercent">Percentagem de compartilhamento</string>
+  <string name="settings_desc_sharePercent">Percentagem de largura de banda para compartilhar (padrão=80)</string>
+  <string name="settings_dialog_sharePercent">Percentagem de largura de banda compartilhada</string>
+  <string name="settings_desc_upnp">Abrir portas do firewall automaticamente</string>
   <string name="settings_label_advanced">Avançado</string>
+  <string name="settings_label_transports">Transportes</string>
+  <string name="settings_label_maxConns">Máx. nº de conexões</string>
+  <string name="settings_label_i2cp">Interface I2CP</string>
   <string name="settings_desc_i2cp">Escutando na porta 7654</string>
+  <string name="settings_label_exploratory_pool">Poço exploratório</string>
+  <string name="settings_desc_exploratory_pool">Parâmetros dos túneis</string>
+  <string name="settings_label_expl_inbound">Túneis de entrada</string>
+  <string name="settings_label_expl_outbound">Túneis de saída</string>
+  <string name="settings_label_expl_length">Duração</string>
+  <string name="settings_desc_expl_length">Quantos saltos usar</string>
+  <string name="settings_label_expl_lengthVariance">Variação de saltos</string>
+  <string name="settings_desc_expl_lengthVariance">Quantos saltos adicionar aleatoriamente</string>
+  <string name="settings_label_expl_quantity">Quantidade</string>
+  <string name="settings_desc_expl_quantity">Quantos túneis</string>
+  <string name="settings_label_expl_backupQuantity">Quantidade tuneis de reserva</string>
+  <string name="settings_desc_expl_backupQuantity">Quantos túneis de reserva</string>
 </resources>

res/values-ro/strings.xml

@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Bine ati venit la I2P! Aceasta aplicatie este un software ALPHA și nu oferă anonimatul puternic. Vă rugăm să citiți notele de lansare și licență.</string>
+  <string name="welcome_new_version">Noua versiune instalată. Vă rugăm să citiți notele de lansare. versiune:</string>
+  <string name="label_home">I2P Acasă</string>
+  <string name="label_statistics">Statistici</string>
+  <string name="label_main_controls">Comenzile principale</string>
+  <string name="label_tools">Instrumente I2P</string>
+  <string name="label_addressbook">Agendă</string>
+  <string name="label_logs">Jurnale</string>
+  <string name="label_error_logs">jurnalele de erori</string>
+  <string name="label_info_and_pages">Informații și pagini</string>
+  <string name="label_welcome_page">Pagina de start</string>
+  <string name="label_news">Noutăți</string>
+  <string name="label_news_status">Ultimele știri I2P</string>
+  <string name="label_peers_status">Parteneri</string>
+  <string name="label_release_notes">Note de publicare</string>
+  <string name="label_licenses">Licențe</string>
+  <string name="label_nonanon_info">Informații  non-anonim</string>
+  <string name="label_website_nonanon">Site-ul web (non-Anonim)</string>
+  <string name="label_faq_nonanon">FAQ (non-Anonim)</string>
+  <string name="action_add">Adaugă</string>
+  <string name="action_router_start">Pornirea router-ului</string>
+  <string name="action_router_stop">Oprirea router-ului</string>
+  <string name="action_reload">Reîncarcă</string>
+  <string name="menu_settings">Configurări</string>
+  <string name="settings_enable">Activează</string>
+  <string name="settings_label_subscriptions">I2P agendă</string>
+  <string name="settings_desc_subscriptions">URLs de abonare:</string>
+  <string name="settings_label_bandwidth">Lățime de bandă și rețea</string>
+  <string name="settings_label_bw_inbound">viteza de intrare</string>
+  <string name="settings_desc_bw_inbound">Viteza maximă de încărcare:</string>
+  <string name="settings_label_bw_outbound">viteza de iesire</string>
+  <string name="settings_desc_bw_outbound">Viteza maximă de încărcare:</string>
+  <string name="settings_label_hiddenMode">Participare</string>
+  <string name="settings_desc_hiddenMode">Dezactivați modul ascuns</string>
+  <string name="settings_label_maxPartTunnels">Max tunele participante</string>
+  <string name="settings_desc_maxPartTunnels">Numarul maxim de tuneluri pentru  participarea la (implicit = 20)</string>
+  <string name="settings_dialog_maxPartTunnels">Numarul maxim de tuneluri pentru participarea </string>
+  <string name="settings_label_sharePercent">procent cota</string>
+  <string name="settings_desc_sharePercent">Procentul de lățime de bandă pentru  partajare (implicit = 80)</string>
+  <string name="settings_dialog_sharePercent">Procentul de lățime de bandă pentru partajare </string>
+  <string name="settings_desc_upnp">Deschide automat porturile firewall</string>
+  <string name="settings_label_advanced">Avansat</string>
+  <string name="settings_label_transports">Transporturi</string>
+  <string name="settings_label_maxConns">Maxim conexiuni</string>
+  <string name="settings_label_i2cp">Interfata I2CP</string>
+  <string name="settings_desc_i2cp">Asculta pe portul 7654</string>
+  <string name="settings_label_exploratory_pool">pool de explorare</string>
+  <string name="settings_desc_exploratory_pool">Parametri tunelului</string>
+  <string name="settings_label_expl_inbound">Tunele de intrare</string>
+  <string name="settings_label_expl_outbound">Tunele de iesire</string>
+  <string name="settings_label_expl_length">Lungime</string>
+  <string name="settings_desc_expl_length">Cât de multe hamei să utilizeze</string>
+  <string name="settings_label_expl_lengthVariance">variație hamei</string>
+  <string name="settings_desc_expl_lengthVariance">Cât de multe hamei de a adăuga la întâmplare</string>
+  <string name="settings_label_expl_quantity">Cantitate</string>
+  <string name="settings_desc_expl_quantity">Cât de multe tunele</string>
+  <string name="settings_label_expl_backupQuantity">Cantitatea de rezervă</string>
+  <string name="settings_desc_expl_backupQuantity">Câți copii de rezervă tunel</string>
+</resources>

routerjars/custom_rules.xml

@@ -38,14 +38,28 @@
 
     <!-- new rules -->
 
-    <target name="buildrouter" depends="-dirs" >
-        <!-- build router and core -->
-        <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" >
-            <target name="buildRouter" />
-            <target name="buildI2PTunnelJar" />
-            <target name="buildAddressbook" />
-            <target name="buildBOB" />
-        </ant>
+
+    <available property="have.router" file="${i2pbase}/build/router.jar" />
+    <available property="have.bob" file="${i2pbase}/apps/BOB/dist/BOB.jar" />
+    <available property="have.i2ptunnel" file="${i2pbase}/apps/i2ptunnel/java/build/i2ptunnel.jar" />
+    <available property="have.addressbook" file="${i2pbase}/apps/addressbook/build" />
+
+    <target name="buildRouter" unless="have.router">
+        <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" target="buildRouter" />
+    </target>
+
+    <target name="buildI2PTunnelJar" unless="have.i2ptunnel">
+        <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" target="buildI2PTunnelJar" />
+    </target>
+    <target name="buildAddressbook" unless="have.addressbook">
+        <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" target="buildAddressbook" />
+    </target>
+
+    <target name="buildBOB" unless="have.bob">
+        <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" target="buildBOB" />
+    </target>
+
+    <target name="buildrouter" depends="-dirs, buildRouter, buildI2PTunnelJar, buildAddressbook, buildBOB">
 
         <!-- router -->
         <copy file="${i2pbase}/build/router.jar" todir="${jar.libs.dir}" />
@@ -61,7 +75,7 @@
                 <exclude name="net/i2p/util/SecureDirectory.class" />
                 <exclude name="net/i2p/util/SecureFile.class" />
                 <exclude name="net/i2p/util/SecureFileOutputStream.class" />
-            </zipfileset >
+            </zipfileset>
         </jar>
 
         <!-- i2ptunnel -->
@@ -70,7 +84,7 @@
         <jar destfile="${jar.libs.dir}/i2ptunnel.jar" >
             <zipfileset src="${i2pbase}/apps/i2ptunnel/java/build/i2ptunnel.jar" >
                 <exclude name="net/i2p/i2ptunnel/I2PTunnelGUI.class" />
-            </zipfileset >
+            </zipfileset>
         </jar>
 
         <!-- addressbook - make a jar, it's a war in the i2p distro -->
@@ -91,7 +105,8 @@
     <target name="distclean" depends="clean">
         <delete dir="${jar.libs.dir}" verbose="${verbose}" />
         <delete dir="jni/build/" verbose="${verbose}" />
-	<delete file="AndroidManifest.xml" verbose="${verbose}" />
+        <delete file="AndroidManifest.xml" verbose="${verbose}" />
+        <ant dir="${i2pbase}" target="distclean" />
     </target>
 
 </project>

routerjars/jni/build.sh

@@ -2,6 +2,8 @@
 #
 # build GMP and libjbigi.so using the Android tools directly
 #
+# TODO: Get more settings from environment variables set in ../custom-rules.xml
+#
 
 # uncomment to skip
 # exit 0
@@ -31,35 +33,71 @@ then
 	exit 0
 fi
 
-I2PBASE=${1:-../../../i2p.i2p}
+I2PBASE=${1:-$THISDIR/../../../i2p.i2p}
 #
-# Wrong again. We want to be able to not have to update this script
+# We want to be able to not have to update this script
 # every time a new NDK comes out. We solve this by using readlink with
 # a wild card, deglobbing automatically sorts to get the highest revision.
 # the dot at the end ensures that it is a directory, and not a file.
 #
-#export NDK=$(realpath ../../android-ndk-r5b/)
 
 ## Simple fix for osx development
-if [ "`uname -s`" == "Darwin" ]; then
-    export NDK=/Developer/android/ndk/
+if [ `uname -s` = "Darwin" ]; then
+    export NDK="/Developer/android/ndk/"
 else
-    export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
+    NDK_GLOB=$THISDIR/'../../../android-ndk-r*/.'
+    export NDK="`readlink -n -e $(for last in $NDK_GLOB; do true; done ; echo $last)`"
 fi
+
+if [ "$NDK" == "" ]; then
+	echo "Cannot find NDK in $NDK_GLOB, install it or adjust NDK_GLOB in script"
+	exit 1
+fi
+if [ ! -d "$NDK" ]; then
+	echo "Cannot find NDK in $NDK, install it"
+	exit 1
+fi
+
 #
 # API level, must match that in ../AndroidManifest.xml
 #
 LEVEL=8
-ARCH=arm
-export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/
-export AABI=arm-linux-androideabi-4.4.3
-if [ "`uname -s`" == "Darwin" ]; then
-    export SYSTEM=darwin-x86
-else
-    export SYSTEM=linux-x86
+ARCH="arm"
+export SYSROOT="$NDK/platforms/android-$LEVEL/arch-$ARCH/"
+if [ ! -d "$SYSROOT" ]; then
+	echo "Cannot find $SYSROOT in NDK, check for support of level: $LEVEL arch: $ARCH or adjust LEVEL and ARCH in script"
+	exit 1
 fi
-export BINPREFIX=arm-linux-androideabi-
-export CC="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}gcc --sysroot=$SYSROOT"
+
+#
+# 4.6 is the GCC version. GCC 4.4.3 support was removed in NDK r9b.
+# Available in r9b:
+#	arm-linux-androideabi-4.6
+#	arm-linux-androideabi-4.8
+#	arm-linux-androideabi-clang3.3
+#	llvm-3.3
+#	mipsel-linux-android-4.6
+#	mipsel-linux-android-4.8
+#	mipsel-linux-android-clang3.3
+#	x86-4.6
+#	x86-4.8
+#	x86-clang3.3
+export AABI="arm-linux-androideabi-4.6"
+if [ `uname -s` = "Darwin" ]; then
+    export SYSTEM="darwin-x86"
+elif [ `uname -m` = "x86_64" ]; then
+    export SYSTEM="linux-x86_64"
+else
+    export SYSTEM="linux-x86"
+fi
+
+export BINPREFIX="arm-linux-androideabi-"
+COMPILER="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}gcc"
+if [ ! -f "$COMPILER" ]; then
+	echo "Cannot find compiler $COMPILER in NDK, check for support of system: $SYSTEM ABI: $AABI or adjust AABI and SYSTEM in script"
+	exit 1
+fi
+export CC="$COMPILER --sysroot=$SYSROOT"
 # worked without this on 4.3.2, but 5.0.2 couldn't find it
 export NM="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}nm"
 STRIP="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}strip"
@@ -78,13 +116,12 @@ JBIGI="$I2PBASE/core/c/jbigi"
 # jbigi about 20-25% slower than java on emulator
 #
 GMPVER=4.3.2
-GMP=$JBIGI/gmp-$GMPVER
+GMP="$JBIGI/gmp-$GMPVER"
 
-if [ ! -d $GMP ]
-then
-	echo "Source dir for GMP version $GMPVER not found in $GMP"
-	echo "Install it there or change GMPVER and/or GMP in this script"
-	exit 1
+if [ ! -d "$GMP" ]; then
+    echo "Source dir for GMP version $GMPVER not found in $GMP"
+    echo "Install it there or change GMPVER and/or GMP in this script"
+    exit 1
 fi
 
 mkdir -p build
@@ -93,25 +130,22 @@ cd build
 # we must set both build and host, so that the configure
 # script will set cross_compile=yes, so that it
 # won't attempt to run the a.out files
-if [ ! -f config.status ]
-then
-	echo "Configuring GMP..."
-    if [ "`uname -s`" == "Darwin" ]; then
-	    $GMP/configure --with-pic --build=x86-darwin --host=armv5-eabi-linux || exit 1
+if [ ! -f config.status ]; then
+    echo "Configuring GMP..."
+    if [ `uname -s` = "Darwin" ]; then
+        $GMP/configure --with-pic --build=x86-darwin --host=armv5-eabi-linux || exit 1
     else
-	    $GMP/configure --with-pic --build=x86-none-linux --host=armv5-eabi-linux || exit 1
+        $GMP/configure --with-pic --build=x86-none-linux --host=armv5-eabi-linux || exit 1
     fi
 fi
 
 echo "Building GMP..."
 make || exit 1
 
-if [ "`uname -s`" == "Darwin" ]; then
-    # Depends on version
-    # TODO: Fix something for finding the newest jdk and set it as home.
-    export JAVA_HOME="/Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home/"
+if [ `uname -s` = "Darwin" ]; then
+    export JAVA_HOME=$(/usr/libexec/java_home)
 else
-    export JAVA_HOME=$(dirname $(dirname $(realpath $(which javac))))
+    [ -z $JAVA_HOME ] && . $I2PBASE/core/c/find-java-home
 fi
 if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
     echo "Cannot find jni.h! Looked in '$JAVA_HOME/include/jni.h'"

routerjars/project.properties

@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-18
+target=android-19
 android.library=true