Merge "Add support for case-sensitive FS in ReadWriteZipFS" into ub-jack-brest

2 files changed, 6 insertions, 1 deletions

diff --git a/jack/src/com/android/jack/library/InputJackLibraryCodec.java b/jack/src/com/android/jack/library/InputJackLibraryCodec.java
index 4dbc3f9..f8ba636 100644
--- a/jack/src/com/android/jack/library/InputJackLibraryCodec.java
+++ b/jack/src/com/android/jack/library/InputJackLibraryCodec.java
@@ -87,7 +87,8 @@ public class InputJackLibraryCodec implements StringCodec<InputJackLibrary> {
             ChangePermission.NOCHANGE), Permission.READ | Permission.WRITE);
         try {
           Service service = messageDigestCodec.checkString(context, "SHA");
-          vfs = new CaseInsensitiveFS(directFS, /* nbGroup = */ 1, /* szGroup = */ 2,
+          vfs = new CaseInsensitiveFS(directFS, /* numGroups = */ JackLibrary.NUM_GROUPS_FOR_DIRS,
+              /* groupSize = */ JackLibrary.GROUP_SIZE_FOR_DIRS,
               new MessageDigestFactory(service), /* debug = */ false);
         } catch (WrongVFSFormatException e) {
           vfs = directFS;
diff --git a/jack/src/com/android/jack/library/JackLibrary.java b/jack/src/com/android/jack/library/JackLibrary.java
index 3f98f4d..d91b66b 100644
--- a/jack/src/com/android/jack/library/JackLibrary.java
+++ b/jack/src/com/android/jack/library/JackLibrary.java
@@ -44,6 +44,10 @@ public interface JackLibrary extends Library {
   @Nonnull
   public static final String KEY_LIB_EMITTER_VERSION = "lib.emitter.version";
 
+  public static final int GROUP_SIZE_FOR_DIRS = 2;
+
+  public static final int NUM_GROUPS_FOR_DIRS = 1;
+
   @Nonnull
   public String getProperty(@Nonnull String key) throws LibraryFormatException;