diff options
author | Benoit Lamarche <benoitlamarche@google.com> | 2015-05-29 17:53:42 +0200 |
---|---|---|
committer | Jean-Philippe Lesot <jplesot@google.com> | 2015-06-01 08:04:51 +0000 |
commit | 947f97a84908e28501e4c33653f2c7203c9b12bb (patch) | |
tree | 0e91df115b6bef76527a062d27d35943ba30956a | |
parent | 2600fe54c29949048100051f92f40f3082c84b76 (diff) | |
download | toolchain_jack-947f97a84908e28501e4c33653f2c7203c9b12bb.zip toolchain_jack-947f97a84908e28501e4c33653f2c7203c9b12bb.tar.gz toolchain_jack-947f97a84908e28501e4c33653f2c7203c9b12bb.tar.bz2 |
Use 1 group instead of 2 for CaseInsensitiveFS digest
Change-Id: I0a19919d0e99ac550ccf6eea7576c920aa17df21
3 files changed, 3 insertions, 3 deletions
diff --git a/jack/src/com/android/jack/library/InputJackLibraryCodec.java b/jack/src/com/android/jack/library/InputJackLibraryCodec.java index 3da05c9..2b81b0a 100644 --- a/jack/src/com/android/jack/library/InputJackLibraryCodec.java +++ b/jack/src/com/android/jack/library/InputJackLibraryCodec.java @@ -87,7 +87,7 @@ public class InputJackLibraryCodec implements StringCodec<InputJackLibrary> { ChangePermission.NOCHANGE), Permission.READ | Permission.WRITE); try { Service service = messageDigestCodec.checkString(context, "SHA"); - vfs = new CaseInsensitiveFS(directFS, /* nbGroup = */ 2, /* szGroup = */ 2, + vfs = new CaseInsensitiveFS(directFS, /* nbGroup = */ 1, /* szGroup = */ 2, new MessageDigestFactory(service), /* debug = */ false); } catch (WrongVFSFormatException e) { vfs = directFS; diff --git a/sched/src/com/android/sched/util/codec/CaseInsensitiveDirectFSCodec.java b/sched/src/com/android/sched/util/codec/CaseInsensitiveDirectFSCodec.java index 7567dfe..96c6169 100644 --- a/sched/src/com/android/sched/util/codec/CaseInsensitiveDirectFSCodec.java +++ b/sched/src/com/android/sched/util/codec/CaseInsensitiveDirectFSCodec.java @@ -65,7 +65,7 @@ public class CaseInsensitiveDirectFSCodec implements StringCodec<VFS> { throws ParsingException { try { Service service = messageDigestCodec.checkString(context, "SHA"); - return new CaseInsensitiveFS(codec.checkString(context, string), /* nbGroup = */ 2, + return new CaseInsensitiveFS(codec.checkString(context, string), /* nbGroup = */ 1, /* szGroup = */ 2, new MessageDigestFactory(service), /* debug = */ false); } catch (WrongVFSFormatException e) { throw new ParsingException(e); diff --git a/sched/src/com/android/sched/vfs/CaseInsensitiveFS.java b/sched/src/com/android/sched/vfs/CaseInsensitiveFS.java index 7aff7cc..8c07e9f 100644 --- a/sched/src/com/android/sched/vfs/CaseInsensitiveFS.java +++ b/sched/src/com/android/sched/vfs/CaseInsensitiveFS.java @@ -63,7 +63,7 @@ public class CaseInsensitiveFS extends BaseVFS<CaseInsensitiveVDir, CaseInsensit public static final IntegerPropertyId NB_GROUP = IntegerPropertyId .create("sched.vfs.case-insensitive.group.count", - "Number of directory used to encode a path name").withMin(0).addDefaultValue(2); + "Number of directory used to encode a path name").withMin(0).addDefaultValue(1); public static final IntegerPropertyId SZ_GROUP = IntegerPropertyId .create("sched.vfs.case-insensitive.group.size", |