Clean libs

OsmAnd-java/build.gradle

@@ -70,6 +70,17 @@ dependencies {
 	testImplementation 'com.google.code.gson:gson:2.8.2'
 	testImplementation 'org.hamcrest:hamcrest-core:1.3'
 
+	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
+	implementation group: 'org.json', name: 'json', version: '20171018' 
+	implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
+	implementation 'org.beanshell:bsh-core:2.0b4'
+	implementation 'org.apache.commons:commons-compress:1.17'
+	implementation 'com.moparisthebest:junidecode:0.1.1'
+	implementation 'com.vividsolutions:jts-core:1.14.0'
+
+	implementation 'net.sf.kxml:kxml2:2.1.8'
+	
+
 	implementation fileTree(dir: "libs", include: ["*.jar"])
 }
 

OsmAnd/build.gradle

@@ -365,11 +365,11 @@ dependencies {
 	implementation 'com.android.support:customtabs:27.1.1'
 	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
 
-	implementation 'commons-logging:commons-logging-api:1.1'
+	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
 	implementation 'commons-codec:commons-codec:1.11'
 	implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
 	implementation 'org.beanshell:bsh-core:2.0b4'
-	implementation 'fr.univ-valenciennes:bzip2:1.0'
+	implementation 'org.apache.commons:commons-compress:1.17'
 	implementation 'com.moparisthebest:junidecode:0.1.1'
 	implementation 'org.immutables:gson:2.5.0'
 	implementation 'com.vividsolutions:jts-core:1.14.0'

OsmAnd/old-ndk-build.sh

@@ -30,4 +30,4 @@ if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5
 fi
 export BUILD_ONLY_OLD_LIB=1
 "$SCRIPT_LOC/../../core-legacy/externals/configure.sh"
-(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j1)
+(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j2)