Update runtime to work with the OpenJdk String.
The key difference here is that the OpenJdk String class
does not maintain an offset or a count field into its backing
char[] array. The offset is assumed to be zero, and the count
is always array.length.
Change-Id: I8b0518642f440cd38d24d9b90c575b7110233cc5
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 2a50484..9273437 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -527,11 +527,9 @@
struct StringOffsets : public CheckOffsets<mirror::String> {
StringOffsets() : CheckOffsets<mirror::String>(false, "Ljava/lang/String;") {
- offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::String, count_), "count"));
- offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::String, hash_code_), "hashCode"));
- offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::String, hash32_), "hash32"));
- offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::String, offset_), "offset"));
- offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::String, array_), "value"));
+ offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::String, hash_), "hash"));
+ offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::String, hash32_), "hash32"));
+ offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::String, array_), "value"));
};
};