diff options
| author | Victor Khimenko <khim@google.com> | 2020-07-03 10:42:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-03 10:42:58 +0000 |
| commit | 4f368633bb5c2b20505d12693121654bd25ab7e9 (patch) | |
| tree | 9a7ce8e1e7c99579ddcc47f54329575df66e1932 | |
| parent | 004f78b646f95523da6317224f3585e57fafddd2 (diff) | |
| parent | f4089a6108ecefbe5c983d72424a0c14890db8bf (diff) | |
| download | platform_external_protobuf-4f368633bb5c2b20505d12693121654bd25ab7e9.tar.gz platform_external_protobuf-4f368633bb5c2b20505d12693121654bd25ab7e9.tar.bz2 platform_external_protobuf-4f368633bb5c2b20505d12693121654bd25ab7e9.zip | |
Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd am: f4089a6108
Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1354625
Change-Id: I282493aaa7d4f9eaa89dca11250420bf9eae9d27
| -rw-r--r-- | Android.bp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 402b76a86..ed0e49a08 100644 --- a/Android.bp +++ b/Android.bp @@ -211,6 +211,8 @@ cc_library { defaults: ["libprotobuf-cpp-full-defaults"], host_supported: true, vendor_available: true, + // TODO(b/153609531): remove when no longer needed. + native_bridge_supported: true, target: { android: { static: { |