summaryrefslogtreecommitdiffstats
path: root/jack
diff options
context:
space:
mode:
authorBenoit Lamarche <benoitlamarche@google.com>2015-06-12 15:45:25 +0200
committerBenoit Lamarche <benoitlamarche@google.com>2015-06-17 18:26:04 +0200
commitf01db511461651a993ae2f33a9c9b19a7c1fe515 (patch)
tree33d5e43b59f5d0b87b52d0a8479d798cfe8eb656 /jack
parent325b47a0195f7ee1a711f87bee42c8293523f558 (diff)
downloadtoolchain_jack-f01db511461651a993ae2f33a9c9b19a7c1fe515.zip
toolchain_jack-f01db511461651a993ae2f33a9c9b19a7c1fe515.tar.gz
toolchain_jack-f01db511461651a993ae2f33a9c9b19a7c1fe515.tar.bz2
Add support for case-sensitive FS in ReadWriteZipFS
Also: - deleted ZipInputOutputVFSCodec which is unused and similar to ZipFSCodec. - introduce constants in JackLibrary for numGroups and groupSize. Bug: 21796981 (cherry picked from commit 37f4d45c334a2e15f0d8aee2fadb2cd823b4ee54) Change-Id: Id744da9c97a04adf728b8688c91a0816715d5cce
Diffstat (limited to 'jack')
-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;