summaryrefslogtreecommitdiffstats
path: root/jack/src/com
diff options
context:
space:
mode:
authorBenoit Lamarche <benoitlamarche@google.com>2015-06-18 10:33:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-06-18 10:33:02 +0000
commit67d857553720b11aff0e824bece97e9fcc1377c7 (patch)
treedb1d4093dff574900b57d41636d4479b7ea8b689 /jack/src/com
parenta934fc4e32baa10238cc94c59eb5171be8624643 (diff)
parentf01db511461651a993ae2f33a9c9b19a7c1fe515 (diff)
downloadtoolchain_jack-67d857553720b11aff0e824bece97e9fcc1377c7.zip
toolchain_jack-67d857553720b11aff0e824bece97e9fcc1377c7.tar.gz
toolchain_jack-67d857553720b11aff0e824bece97e9fcc1377c7.tar.bz2
Merge "Add support for case-sensitive FS in ReadWriteZipFS" into ub-jack-brest
Diffstat (limited to 'jack/src/com')
-rw-r--r--jack/src/com/android/jack/library/InputJackLibraryCodec.java3
-rw-r--r--jack/src/com/android/jack/library/JackLibrary.java4
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;