diff options
author | Wink Saville <wink@google.com> | 2010-10-07 13:56:12 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 13:56:12 -0700 |
commit | 9875374d1865894e2254adf781c54e040f75d635 (patch) | |
tree | f6bbd9e833f3c9fb28dccdde3c34a9d5868dcc4d | |
parent | aa645be0632f4d75ab92120bf81ead2bbd30f8f7 (diff) | |
parent | 3574de1ca8301e1e13d1c89f2e2a902499d6bae9 (diff) | |
download | external_protobuf-9875374d1865894e2254adf781c54e040f75d635.zip external_protobuf-9875374d1865894e2254adf781c54e040f75d635.tar.gz external_protobuf-9875374d1865894e2254adf781c54e040f75d635.tar.bz2 |
am 3574de1c: Remove vestigial references to StringUtf8Micro.
Merge commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9' into gingerbread-plus-aosp
* commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9':
Remove vestigial references to StringUtf8Micro.
-rw-r--r-- | java/README.txt | 7 | ||||
-rw-r--r-- | java/src/test/java/com/google/protobuf/MicroTest.java | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/java/README.txt b/java/README.txt index 4a2839a..8972792 100644 --- a/java/README.txt +++ b/java/README.txt @@ -110,7 +110,6 @@ CodedInputStreamMicro.java CodedOutputStreamMicro.java InvalidProtocolBufferException.java MessageMicro.java -StringUtf8Micro.java WireFormatMicro.java If you wish to change on the code generator it is located @@ -133,9 +132,9 @@ java_outer_classname -> <file-name>|<package-name> opt: This change the code generation to optimize for speed, opt=speed, or space, opt=space. When opt=speed this - changes the code generation for strings to use - StringUtf8Micro which eliminates multiple conversions - of the string to utf8. The default value is opt=space. + changes the code generation for strings so that multiple + conversions to Utf8 are eliminated. The default value + is opt=space. java_use_vector: Is a boolean flag either java_use_vector=true or diff --git a/java/src/test/java/com/google/protobuf/MicroTest.java b/java/src/test/java/com/google/protobuf/MicroTest.java index ebfccc2..12533ac 100644 --- a/java/src/test/java/com/google/protobuf/MicroTest.java +++ b/java/src/test/java/com/google/protobuf/MicroTest.java @@ -35,7 +35,6 @@ import com.google.protobuf.micro.MicroOuterClass.TestAllTypesMicro; import com.google.protobuf.micro.RecursiveMessageMicro; import com.google.protobuf.micro.SimpleMessageMicro; import com.google.protobuf.micro.StringUtf8; -import com.google.protobuf.micro.StringUtf8Micro; import com.google.protobuf.micro.UnittestImportMicro; import com.google.protobuf.micro.ByteStringMicro; |