Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java

@@ -1,6 +1,7 @@
 package net.osmand.render;
 
 import gnu.trove.iterator.TIntObjectIterator;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -59,7 +60,12 @@ public class RenderingRulesStoragePrinter {
 			}
 		};
 		storage.parseRulesFromXmlInputStream(is, resolver);
-		new RenderingRulesStoragePrinter().printJavaFile(storage);
+		new RenderingRulesStoragePrinter().printCppRules(storage, RenderingRulesStorage.ORDER_RULES);
+	}
+	
+	protected void printCppRules(RenderingRulesStorage storage, int rules) throws IOException  {
+		TIntObjectHashMap<RenderingRule> rp = storage.tagValueGlobalRules[rules];
+		
 	}
 	
 	protected void printJavaFile(RenderingRulesStorage storage) throws IOException {

OsmAnd/build.gradle

@@ -302,10 +302,9 @@ dependencies {
 			exclude: [
 					"QtAndroid-bundled.jar",
 					"QtAndroidAccessibility-bundled.jar",
-					"android-support*.jar",
 					"OsmAndCore_android.jar",
 					"OsmAndCore_wrapper.jar"])
-	compile "com.github.ksoichiro:android-observablescrollview:1.5.0"
+	// compile "com.github.ksoichiro:android-observablescrollview:1.5.0"
 	// compile "com.android.support:appcompat-v7:21.0.3"
 	// compile "com.github.shell-software:fab:1.0.5"
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"

OsmAnd/project.properties

@@ -13,5 +13,3 @@ split.density=false
 target=android-21
 dex.force.jumbo=true
 android.library.reference.1=../eclipse-compile/appcompat
-android.library.reference.2=../eclipse-compile/observable
-android.library.reference.2=../eclipse-compile/observable