<feed xmlns='http://www.w3.org/2005/Atom'>
<title>platform_external_protobuf/python/setup.cfg, branch sdk-release</title>
<subtitle>Unnamed repository; edit this file 'description' to name the repository.
</subtitle>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/'/>
<entry>
<title>Re-apply merge of tag v3.5.2</title>
<updated>2019-09-05T21:44:01+00:00</updated>
<author>
<name>Colin Cross</name>
<email>ccross@android.com</email>
</author>
<published>2019-08-14T01:26:41+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=3ed2fc523734b00b1779665e3adbe46139d10407'/>
<id>3ed2fc523734b00b1779665e3adbe46139d10407</id>
<content type='text'>
v3.5.2 was previously merged in Ia1b9174f7e3ac5c2d86ea7370d5c6c3ef1a37300
and then reverted as part of Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337,
which leaves v3.5.2 in the history but v3.0.0-beta3 in the tree.  Reapply
the merge to v3.5.2 so that v3.9.1 can be merged on top of it.

Bug: 117607748
Test: m checkbuild
Change-Id: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
Merged-In: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
v3.5.2 was previously merged in Ia1b9174f7e3ac5c2d86ea7370d5c6c3ef1a37300
and then reverted as part of Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337,
which leaves v3.5.2 in the history but v3.0.0-beta3 in the tree.  Reapply
the merge to v3.5.2 so that v3.9.1 can be merged on top of it.

Bug: 117607748
Test: m checkbuild
Change-Id: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
Merged-In: I77a2c0638b00487d3acfbf3c0d634f26caf5b9be
</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Merge changes from topic "protobuf3.5.2""</title>
<updated>2018-11-05T01:36:28+00:00</updated>
<author>
<name>Colin Cross</name>
<email>ccross@android.com</email>
</author>
<published>2018-11-05T01:34:26+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=11fb7aeddd6ff7229bcf0834017f8091f97d7edb'/>
<id>11fb7aeddd6ff7229bcf0834017f8091f97d7edb</id>
<content type='text'>
This reverts commit 584979bf55601bd23e533d704a75cd0e95af66b9, reversing
changes made to 219bbcdcd5b1dbf19758ff2e75d971b98215896d:
      Remove libprotobuf-java-lite
      Update stubs
      Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
      Update javamicro to compile against v3.5.2
      Update Android.bp to match BUILD
      Rerun configure
      Merge tag 'v3.5.2' into master
      Revert "Remove 2 usage of isspace as they are not stl port compatible"
      Revert "Use GOOGLE_CHECK Macro for validation"
      Revert "Emit macros with proper parentheses."
      Revert "Generate syntactically correct java for imports from classes with no packages."
      Revert "Fix some unused parameter warnings"
      Revert "protobuf: work around a static analyzer bug"
      Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."

Change-Id: Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit 584979bf55601bd23e533d704a75cd0e95af66b9, reversing
changes made to 219bbcdcd5b1dbf19758ff2e75d971b98215896d:
      Remove libprotobuf-java-lite
      Update stubs
      Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"
      Update javamicro to compile against v3.5.2
      Update Android.bp to match BUILD
      Rerun configure
      Merge tag 'v3.5.2' into master
      Revert "Remove 2 usage of isspace as they are not stl port compatible"
      Revert "Use GOOGLE_CHECK Macro for validation"
      Revert "Emit macros with proper parentheses."
      Revert "Generate syntactically correct java for imports from classes with no packages."
      Revert "Fix some unused parameter warnings"
      Revert "protobuf: work around a static analyzer bug"
      Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."

Change-Id: Ia04c0b15ebd45e8c7e02edaa6e1f10aeb11ef337
</pre>
</div>
</content>
</entry>
<entry>
<title>add setup.cfg for building wheels</title>
<updated>2016-07-29T21:02:07+00:00</updated>
<author>
<name>Jisi Liu</name>
<email>jisi.liu@gmail.com</email>
</author>
<published>2016-07-29T21:02:07+00:00</published>
<link rel='alternate' type='text/html' href='https://git.replicant.us/mirrors/AOSP/platform_external_protobuf/commit/?id=811674f4793bfd5b26835d322477adb15ae3855f'/>
<id>811674f4793bfd5b26835d322477adb15ae3855f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
