Merge "Revert "Revert "Increment dex version for N api level use""" into ub-jack-carnac
diff --git a/jack-tests/prebuilts/core-stubs-mini.jack b/jack-tests/prebuilts/core-stubs-mini.jack
index bcdd297..18f0d46 100644
--- a/jack-tests/prebuilts/core-stubs-mini.jack
+++ b/jack-tests/prebuilts/core-stubs-mini.jack
Binary files differ
diff --git a/jack-tests/prebuilts/core-stubs-mini.jar b/jack-tests/prebuilts/core-stubs-mini.jar
index 92d149c..a5137cd 100644
--- a/jack-tests/prebuilts/core-stubs-mini.jar
+++ b/jack-tests/prebuilts/core-stubs-mini.jar
Binary files differ
diff --git a/jack-tests/prebuilts/ecj-tests-lib.jar b/jack-tests/prebuilts/ecj-tests-lib.jar
index 8f9e3cc..e74083c 100644
--- a/jack-tests/prebuilts/ecj-tests-lib.jar
+++ b/jack-tests/prebuilts/ecj-tests-lib.jar
Binary files differ
diff --git a/jack-tests/prebuilts/junit4-lib.jack b/jack-tests/prebuilts/junit4-lib.jack
index 98bb587..7854d4a 100644
--- a/jack-tests/prebuilts/junit4-lib.jack
+++ b/jack-tests/prebuilts/junit4-lib.jack
Binary files differ
diff --git a/jack/prebuilts/core-stubs-mini.jack b/jack/prebuilts/core-stubs-mini.jack
index bcdd297..18f0d46 100644
--- a/jack/prebuilts/core-stubs-mini.jack
+++ b/jack/prebuilts/core-stubs-mini.jack
Binary files differ
diff --git a/jack/prebuilts/core-stubs-mini.jar b/jack/prebuilts/core-stubs-mini.jar
index 92d149c..a5137cd 100644
--- a/jack/prebuilts/core-stubs-mini.jar
+++ b/jack/prebuilts/core-stubs-mini.jar
Binary files differ
diff --git a/jack/src/com/android/jack/library/v0002/InputJackLibraryImpl.java b/jack/src/com/android/jack/library/v0002/InputJackLibraryImpl.java
index ced4e17..719c89a 100644
--- a/jack/src/com/android/jack/library/v0002/InputJackLibraryImpl.java
+++ b/jack/src/com/android/jack/library/v0002/InputJackLibraryImpl.java
@@ -326,9 +326,13 @@
           String value = getProperty("config." + property.getName());
           PrebuiltCompatibility compatibility = property.getCategory(PrebuiltCompatibility.class);
           if (compatibility != null) {
-            return compatibility.isCompatible(config, value);
+            if (!compatibility.isCompatible(config, value)) {
+              return false;
+            }
           } else {
-            return config.parseAs(value, property).equals(config.get(property));
+            if (!config.parseAs(value, property).equals(config.get(property))) {
+              return false;
+            }
           }
         } catch (MissingLibraryPropertyException e) {
           logger.log(Level.FINE, e.getMessage());
diff --git a/jack/src/com/android/jack/library/v0002/Version.java b/jack/src/com/android/jack/library/v0002/Version.java
index ab41e3f..513c857 100644
--- a/jack/src/com/android/jack/library/v0002/Version.java
+++ b/jack/src/com/android/jack/library/v0002/Version.java
@@ -21,9 +21,9 @@
  */
 public class Version {
 
-  public static final int MINOR_MIN = 2;
+  public static final int MINOR_MIN = 3;
 
-  public static final int MINOR = 2;
+  public static final int MINOR = 3;
 
   public static final int MAJOR = 2;
 }
diff --git a/jill/src/com/android/jill/frontend/java/AnnotationWriter.java b/jill/src/com/android/jill/frontend/java/AnnotationWriter.java
index 4bb366e..aeca169 100644
--- a/jill/src/com/android/jill/frontend/java/AnnotationWriter.java
+++ b/jill/src/com/android/jill/frontend/java/AnnotationWriter.java
@@ -186,6 +186,8 @@
     writer.writeRetentionPolicyEnum(retentionPolicy);
     writer.writeId(anno.desc);
     writeNameValuePair(anno.values);
+    writer.writeOpenNodeList(); // Markers
+    writer.writeCloseNodeList();
     sourceInfoWriter.writeUnknownDebugEnd();
     writer.writeClose();
   }
diff --git a/jill/src/com/android/jill/frontend/java/JavaTransformer.java b/jill/src/com/android/jill/frontend/java/JavaTransformer.java
index 129922f..d7b536e 100644
--- a/jill/src/com/android/jill/frontend/java/JavaTransformer.java
+++ b/jill/src/com/android/jill/frontend/java/JavaTransformer.java
@@ -52,7 +52,7 @@
   private static final String LIB_MAJOR_VERSION = "2";
 
   @Nonnull
-  private static final String LIB_MINOR_VERSION = "2";
+  private static final String LIB_MINOR_VERSION = "3";
 
   @Nonnull
   private static final String JAYCE_MAJOR_VERSION = "3";