Merge branch 'master' into release

Author: petekanev

.gitignore

@@ -10,8 +10,6 @@ dist/
 local.properties
 
 gen/
-armeabi-v7a/
-x86/
 obj/
 bin/
 .svn/

.travis.yml

@@ -27,6 +27,9 @@ cache:
   - "$HOME/.gradle/caches/"
   - "$HOME/.gradle/wrapper/"
 before_install:
+  - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
+  - sudo apt-get install git-lfs
+  - git lfs install
   - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
   - git submodule update --init --recursive
   - wget http://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip
@@ -36,6 +39,7 @@ before_install:
   - export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
   - export PATH=${PATH}:${ANDROID_NDK_HOME}
 script:
+  - git lfs pull
   - "./gradlew createPackage -i -PpreReleaseVersion=$PACKAGE_VERSION -PgitCommitVersion=$TRAVIS_COMMIT --stacktrace"
   - echo no | android create avd --force -n Arm21 -t android-21 -b armeabi-v7a -c 12M
   - emulator -avd Arm21 -no-skin -no-audio -no-window &

android-metadata-generator/src/src/com/telerik/metadata/Builder.java

@@ -11,6 +11,7 @@
 import com.telerik.metadata.TreeNode.FieldInfo;
 import com.telerik.metadata.TreeNode.MethodInfo;
 import com.telerik.metadata.bcl.JarFile;
+import com.telerik.metadata.desc.MetadataInfoAnnotationDescriptor;
 import com.telerik.metadata.desc.ClassDescriptor;
 import com.telerik.metadata.desc.FieldDescriptor;
 import com.telerik.metadata.desc.MethodDescriptor;
@@ -94,12 +95,24 @@ private static void generate(ClassDescriptor clazz, TreeNode root) throws Except
 		if (!isClassPublic(clazz)) {
 			return;
 		}
-		TreeNode node = getOrCreateNode(root, clazz);
 
-		setNodeMembers(clazz, node, root);
+		MetadataInfoAnnotationDescriptor metadataInfo = clazz.getMetadataInfoAnnotation();
+		boolean hasClassMetadataInfo = metadataInfo != null;
+		String predefinedSuperClassname = null;
+		if (hasClassMetadataInfo) {
+			if (metadataInfo.skip()) {
+				return;
+			} else {
+				predefinedSuperClassname = metadataInfo.getSuperClassname();
+			}
+		}
+
+		TreeNode node = getOrCreateNode(root, clazz, predefinedSuperClassname);
+
+		setNodeMembers(clazz, node, root, hasClassMetadataInfo);
 	}
 
-	private static void setNodeMembers(ClassDescriptor clazz, TreeNode node, TreeNode root) throws Exception {
+	private static void setNodeMembers(ClassDescriptor clazz, TreeNode node, TreeNode root, boolean hasClassMetadataInfo) throws Exception {
 		Map<String, MethodInfo> existingMethods = new HashMap<String, MethodInfo>();
 		for (MethodInfo mi : node.instanceMethods) {
 			existingMethods.put(mi.name + mi.sig, mi);
@@ -114,6 +127,13 @@ private static void setNodeMembers(ClassDescriptor clazz, TreeNode node, TreeNod
 			if (m.isSynthetic())
 				continue;
 
+			if (hasClassMetadataInfo && !m.getName().equals("<init>")) {
+				MetadataInfoAnnotationDescriptor metadataInfo = m.getMetadataInfoAnnotation();
+				if ((metadataInfo != null) && metadataInfo.skip()) {
+					continue;
+				}
+			}
+
 			if (m.isPublic() || m.isProtected()) {
 				boolean isStatic = m.isStatic();
 
@@ -139,7 +159,7 @@ private static void setNodeMembers(ClassDescriptor clazz, TreeNode node, TreeNod
 
 				if (mi.signature != null) {
 					if (isStatic) {
-						mi.declaringType = getOrCreateNode(root, clazz);
+						mi.declaringType = getOrCreateNode(root, clazz, null);
 						node.staticMethods.add(mi);
 					} else {
 						String sig = m.getName() + m.getSignature();
@@ -174,10 +194,10 @@ private static void setFieldInfo(ClassDescriptor clazz, TreeNode node, TreeNode
 				if (f.isStatic()) {
 					if(interfaceClass != null) {
 						// changes declaring type of static fields from implementing class to interface
-						fi.declaringType = getOrCreateNode(root, interfaceClass);	
+						fi.declaringType = getOrCreateNode(root, interfaceClass, null);
 					}
 					else {
-						fi.declaringType = getOrCreateNode(root, clazz);
+						fi.declaringType = getOrCreateNode(root, clazz, null);
 					}
 					node.staticFields.add(fi);
 				} else {
@@ -224,13 +244,13 @@ private static TreeNode getOrCreateNode(TreeNode root, TypeDescriptor type)
 		} else {
 			String name = ClassUtil.getCanonicalName(type.getSignature());
 			ClassDescriptor clazz = ClassRepo.findClass(name);
-			node = getOrCreateNode(root, clazz);
+			node = getOrCreateNode(root, clazz, null);
 		}
 
 		return node;
 	}
 
-	private static TreeNode getOrCreateNode(TreeNode root, ClassDescriptor clazz) throws Exception {
+	private static TreeNode getOrCreateNode(TreeNode root, ClassDescriptor clazz, String predefinedSuperClassname) throws Exception {
 		if (ClassUtil.isPrimitive(clazz)) {
 			return TreeNode.getPrimitive(clazz);
 		}
@@ -297,11 +317,16 @@ private static TreeNode getOrCreateNode(TreeNode root, ClassDescriptor clazz) th
 		}
 		node = child;
 		if (node.baseClassNode == null) {
-			ClassDescriptor baseClass = clazz.isInterface() ? ClassUtil
-					.getClassByName("java.lang.Object") : ClassUtil
-					.getSuperclass(clazz);
+			ClassDescriptor baseClass = null;
+			if (predefinedSuperClassname != null) {
+				baseClass = ClassUtil.getClassByName(predefinedSuperClassname);
+			} else {
+				baseClass = clazz.isInterface()
+						? ClassUtil.getClassByName("java.lang.Object")
+						: ClassUtil.getSuperclass(clazz);
+			}
 			if (baseClass != null) {
-				node.baseClassNode = getOrCreateNode(root, baseClass);
+				node.baseClassNode = getOrCreateNode(root, baseClass, null);
 				copyBasePublicApi(baseClass, node, root);
 			}
 		}
@@ -312,7 +337,7 @@ private static TreeNode getOrCreateNode(TreeNode root, ClassDescriptor clazz) th
 	private static void copyBasePublicApi(ClassDescriptor baseClass, TreeNode node,
 			TreeNode root) throws Exception {
 		while ((baseClass != null) && !baseClass.isPublic()) {
-			setNodeMembers(baseClass, node, root);
+			setNodeMembers(baseClass, node, root, false);
 			baseClass = ClassUtil.getSuperclass(baseClass);
 		}
 	}
@@ -349,7 +374,7 @@ private static TreeNode createArrayNode(TreeNode root, String className)
 				if (clazz.isStatic()) {
 					child.nodeType |= TreeNode.Static;
 				}
-				child.arrayElement = getOrCreateNode(root, clazz);
+				child.arrayElement = getOrCreateNode(root, clazz, null);
 			}
 		}
 

android-metadata-generator/src/src/com/telerik/metadata/bcl/ClassInfo.java

@@ -1,6 +1,7 @@
 package com.telerik.metadata.bcl;
 
 import com.telerik.metadata.ClassUtil;
+import com.telerik.metadata.desc.MetadataInfoAnnotationDescriptor;
 import com.telerik.metadata.desc.ClassDescriptor;
 import com.telerik.metadata.desc.FieldDescriptor;
 import com.telerik.metadata.desc.MethodDescriptor;
@@ -111,6 +112,11 @@ public FieldDescriptor[] getFields() {
         return fields;
     }
 
+    @Override
+    public MetadataInfoAnnotationDescriptor getMetadataInfoAnnotation() {
+        return null;
+    }
+
     @Override
     public String[] getInterfaceNames() {
         return clazz.getInterfaceNames();

android-metadata-generator/src/src/com/telerik/metadata/bcl/MethodInfo.java

@@ -1,5 +1,6 @@
 package com.telerik.metadata.bcl;
 
+import com.telerik.metadata.desc.MetadataInfoAnnotationDescriptor;
 import com.telerik.metadata.desc.MethodDescriptor;
 import com.telerik.metadata.desc.TypeDescriptor;
 import org.apache.bcel.classfile.Method;
@@ -56,4 +57,9 @@ public TypeDescriptor[] getArgumentTypes() {
     public TypeDescriptor getReturnType() {
         return new TypeInfo(m.getReturnType());
     }
+
+    @Override
+    public MetadataInfoAnnotationDescriptor getMetadataInfoAnnotation() {
+        return null;
+    }
 }

android-metadata-generator/src/src/com/telerik/metadata/desc/ClassDescriptor.java

@@ -13,6 +13,8 @@ public interface ClassDescriptor {
 
     FieldDescriptor[] getFields();
 
+    MetadataInfoAnnotationDescriptor getMetadataInfoAnnotation();
+
     String[] getInterfaceNames();
 
     String getPackageName();

android-metadata-generator/src/src/com/telerik/metadata/desc/MetadataInfoAnnotationDescriptor.java

@@ -0,0 +1,6 @@
+package com.telerik.metadata.desc;
+
+public interface MetadataInfoAnnotationDescriptor {
+    boolean skip();
+    String getSuperClassname();
+}

android-metadata-generator/src/src/com/telerik/metadata/desc/MethodDescriptor.java

@@ -11,4 +11,6 @@ public interface MethodDescriptor {
 
     TypeDescriptor[] getArgumentTypes();
     TypeDescriptor getReturnType();
+
+    MetadataInfoAnnotationDescriptor getMetadataInfoAnnotation();
 }

android-metadata-generator/src/src/com/telerik/metadata/dx/ClassInfo.java

@@ -1,13 +1,13 @@
 package com.telerik.metadata.dx;
 
+import com.android.dex.Annotation;
 import com.android.dex.ClassData;
 import com.android.dex.ClassDef;
 import com.android.dex.Dex;
-import com.android.dex.MethodId;
-import com.android.dex.ProtoId;
 import com.android.dx.rop.code.AccessFlags;
 import com.android.dx.rop.cst.CstType;
 import com.android.dx.rop.type.Type;
+import com.telerik.metadata.desc.MetadataInfoAnnotationDescriptor;
 import com.telerik.metadata.desc.ClassDescriptor;
 import com.telerik.metadata.desc.FieldDescriptor;
 import com.telerik.metadata.desc.MethodDescriptor;
@@ -102,6 +102,43 @@ public FieldDescriptor[] getFields() {
         return fields;
     }
 
+    @Override
+    public MetadataInfoAnnotationDescriptor getMetadataInfoAnnotation() {
+        int annotationsOffset = classDef.getAnnotationsOffset();
+        if (annotationsOffset == 0) {
+            return null;
+        }
+
+        Dex dex = dexFile.getDex();
+
+        int classDefIndex = dex.findClassDefIndexFromTypeIndex(classDef.getTypeIndex());
+        int dexAnnotationDirectoryOffset = dex.annotationDirectoryOffsetFromClassDefIndex(classDefIndex);
+        if (dexAnnotationDirectoryOffset == 0) {
+            return null;
+        }
+        Dex.Section dirSection = dex.open(dexAnnotationDirectoryOffset);
+        int classSetOffset = dirSection.readInt();
+
+        int annotationSetOffset = classSetOffset;
+
+        if (annotationSetOffset == 0) {
+            return null;
+        }
+
+        Dex.Section annSetSection = dex.open(annotationSetOffset);
+        int size = annSetSection.readInt();
+        for (int i = 0; i < size; i++) {
+            int annotationOffset = annSetSection.readInt();
+            Dex.Section annSection = dex.open(annotationOffset);
+            Annotation annotation = annSection.readAnnotation();
+            String annotationName = dex.strings().get(dex.typeIds().get(annotation.getTypeIndex()));
+            if (annotationName.equals("Lcom/telerik/metadata/MetadataInfo;")) {
+                return new MetadataInfoAnnotationInfo(dexFile, annotation);
+            }
+        }
+        return null;
+    }
+
     @Override
     public String[] getInterfaceNames() {
         ArrayList<String> names = new ArrayList<String>();

android-metadata-generator/src/src/com/telerik/metadata/dx/MetadataInfoAnnotationInfo.java

@@ -0,0 +1,45 @@
+package com.telerik.metadata.dx;
+
+import com.android.dex.Annotation;
+import com.android.dex.EncodedValueReader;
+import com.telerik.metadata.desc.MetadataInfoAnnotationDescriptor;
+
+import java.util.List;
+
+public class MetadataInfoAnnotationInfo implements MetadataInfoAnnotationDescriptor {
+    private final DexFile dexFile;
+    private final Annotation annotation;
+
+    public MetadataInfoAnnotationInfo(DexFile dexFile, Annotation annotation) {
+        this.dexFile = dexFile;
+        this.annotation = annotation;
+    }
+
+    @Override
+    public boolean skip() {
+        List<String> strings = dexFile.getDex().strings();
+        EncodedValueReader reader = annotation.getReader();
+        int count = reader.readAnnotation();
+        for (int i=0; i<count; i++) {
+            String annName = strings.get(reader.readAnnotationName());
+            if (annName.equals("skip")) {
+                return reader.readBoolean();
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getSuperClassname() {
+        List<String> strings = dexFile.getDex().strings();
+        EncodedValueReader reader = annotation.getReader();
+        int count = reader.readAnnotation();
+        for (int i=0; i<count; i++) {
+            String annName = strings.get(reader.readAnnotationName());
+            if (annName.equals("superClassname")) {
+                return strings.get(reader.readString());
+            }
+        }
+        return null;
+    }
+}