platform_external_protobuf/Android.mk, branch security-oc-release

Merge remote-tracking branch 'goog/protobuf3' into 'goog/master'

2016-11-08T17:42:09+00:00

This merge updates protobuf from v2.6.1 to v3.0.0-beta3.

Local modifications compared to upstream done during the merge:
* Updated list of C++/Java sources in Android.mk
* Register the Android specific java micro compiler
* Migrate android specific tests to new package names
* Automatically detect RTTI from compiler defined macros
* Fix build when compiled with stlport

Bug: b/28974522
Change-Id: I76344103ff2fa60951aa3ab3103b1bfa03742e71

Convert native code to Soong

2016-08-01T05:45:28+00:00

Soong doesn't yet support Java, so leave those parts in the Android.mk.

Change-Id: Iaeefd54a05190fb5d39a6d79175b1bfeb8cc2a02

Support building lite static libraries on host and platform.

2016-06-23T14:21:06+00:00

It is to support using protobuf in simpleperf.

Bug: 28114205
Change-Id: Ie6adeabd8cbec71d165ed584b1e2471e4a45ef4e
(cherry picked from commit 63d886b7d36c61b22b5fea2fb4877c4904ba3601)

resolve merge conflicts of 536d7e9 to nyc-dev-plus-aosp

2016-06-14T00:56:12+00:00

Change-Id: Idd32fc68238209aa01823e3009220849ad95f5e6

Fix the build systems after updating to v3.0.0-beta-3

2016-06-10T23:30:51+00:00

Change-Id: I9eccc0cc104d7f411ea088f80aaeb7e10d7e7463

Support building lite static libraries on host and platform.

2016-06-08T03:32:37+00:00

It is to support using protobuf in simpleperf.

Bug: 28114205
Change-Id: Ie6adeabd8cbec71d165ed584b1e2471e4a45ef4e

Build host libraries for Windows

2016-04-07T00:35:26+00:00

Change-Id: I4f2eadf97a7d78cebfc0001a38f3c80750eac5fc

Add static c++ host target for host side tools

2016-03-11T03:23:14+00:00

Change-Id: I8ce3190f61e7871c4bbf6d4ddaee6ea2bd8e583b

Merge "Force protobuf to continue to use v51 (1.7) .class files"

2016-02-23T13:04:26+00:00

am: 34ecb3269f

* commit '34ecb3269f3270c8745bbcb960a362973977e241':
  Force protobuf to continue to use v51 (1.7) .class files

Force protobuf to continue to use v51 (1.7) .class files

2016-02-22T18:11:15+00:00

The default is changing to v52 (1.8).

The build for this package uses jarjar to repackage .class files.

The version of jarjar in the Android tree does not currently
support v52 .class files.

Bug: 26753820
(cherry picked from commit 8e67c67896e167937fd7b05493a57df5f4f7c90f)

Change-Id: I9cd43f3a45fab904a42ae2510623457a6aa941fb