aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-10-14Move most protoc sources to libprotocandroid-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseColin Cross
Match the library layout in the BUILD file by moving most of the protoc sources into libprotoc and leaving only main.cc in aprotoc. Bug: 151768015 Test: m checkbuild Change-Id: I00a6efd1f9865299c03ef84b09adffa46eab7a0f Merged-In: I00a6efd1f9865299c03ef84b09adffa46eab7a0f
2020-07-14Make libprotobuf-cpp-full buildable for native_bridge am: 1ff51e3198android-mainline-11.0.0_r35Victor Khimenko
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: Id577591801a8f267201343cc5e6555275bd27984
2020-07-10Make libprotobuf-cpp-full buildable for native_bridgeandroid11-devVictor Khimenko
Bug: http://b/153609531 Test: m libprotobuf-cpp-full.native_bridge Change-Id: Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 Merged-In: Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4
2020-06-18Set apex_available for libprotobuf-java-lite. am: 577f4f4c79waynema
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: Ic2e279f27a18fd5e10e0e2637a8fe096029550e0
2020-06-17Set apex_available for libprotobuf-java-lite.waynema
Bug: 153942334 Test: make Change-Id: I7b618a3f946493d227cc6a9915a6965ec5ed4688
2020-04-27Set min_sdk_version to be part of mainline modulesJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Merged-In: I5bf9ceb712691916a90afcae92056d0b5875f78c Change-Id: I5bf9ceb712691916a90afcae92056d0b5875f78c (cherry picked from commit 28ca39bf520007aacca6c1ee26b87b165479f156)
2020-04-20make libprotobuf-java-lite available to com.android.wifi APEXJiyong Park
The APEX uses the protobuf lib via wifi-lite-protos and wifi-service-pre-jarjar. Exempt-From-Owner-Approval: cherry-pick Bug: 150999716 Test: m Merged-In: Ia2ea30bef7279113eec5b35f6cec676254a636af (cherry picked from commit faf03fd14145184c6979154b9eab486097ff9eb7) Change-Id: Ia2ea30bef7279113eec5b35f6cec676254a636af
2020-04-20Set apex_available propertyJiyong Park
The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Exempt-From-Owner-Approval: cherry-pick Bug: 150999716 Test: m Merged-In: I20a6ef3e3a95c5ebce63666e7b88623997623083 (cherry picked from commit dd6f59aad67e08ade1436125acd7008e2c75404b) Change-Id: I20a6ef3e3a95c5ebce63666e7b88623997623083
2020-02-14Allow protobufutils to be linked from apexJeffrey Huang
This cannot be done in aosp because statsd apex doesn't exist there. Bug: 145923087 Test: m -j Change-Id: I8c0f21ca63503663826c891c34be67f08759fc05
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307 am: ↵Automerger Merge Worker
247616f215 am: 26d6ef2d57 Change-Id: I86868511566e9c296f3cebe19b5064a29c1039ed
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307 am: ↵Automerger Merge Worker
247616f215 Change-Id: Iecafb370dca48bd7b883d37ce62bb6198c4ee7c1
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I2c7e33fc78c2ba521955ec1a0998b5282215c8e5
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite."Joshua Duong
2020-02-10Set apex_available for libprotobuf-cpp-lite.Joshua Duong
Bug: 149181583 Bug: 111434128 Bug: 147364041 Test: make Change-Id: I8fa43a64a2fbe30a7e95a8e623d58a1d04dcb73d
2020-02-07Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3 am: 3f23491f86 am: ↵Automerger Merge Worker
fc12f829bb Change-Id: I3b04fdc425ec5bb78f6309bc282d3964b59eb9e3
2020-02-07Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3 am: 3f23491f86Automerger Merge Worker
Change-Id: I1ee2c41d03965fd8dd5da95d7c8044253822fa92
2020-02-07Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3Automerger Merge Worker
Change-Id: Ida0be3b8b45eb8fc204490b393abb8002433f783
2020-02-07Merge "CMakeLists for Cross-compiling"Treehugger Robot
2020-02-05CMakeLists for Cross-compilingHao Chen
Bug: b/148877100 Test: verified successful cross compilation Change-Id: Ife96babf276f47aed46efdd330777552c444e5eb
2020-01-24[automerger skipped] Merge "libprotobuf-cpp-lite is removed from VNDK." am: ↵Automerger Merge Worker
7a345e6d56 am: b8fdd31ba2 -s ours am: e8ea9ddd74 -s ours am skip reason: Change-Id Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d with SHA-1 4d7991c2bf is in history Change-Id: I3d0fd90429837d98be612c7de5bf5e803a44fae6
2020-01-24[automerger skipped] Merge "libprotobuf-cpp-lite is removed from VNDK." am: ↵Automerger Merge Worker
7a345e6d56 am: b8fdd31ba2 -s ours am skip reason: Change-Id Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d with SHA-1 4d7991c2bf is in history Change-Id: I68071fc22be7a978aed8a51a1a3f3be827e998e8
2020-01-24Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7a345e6d56Automerger Merge Worker
Change-Id: I439247ee25308ed886b8407afe2654465cf960fe
2020-01-24Merge "libprotobuf-cpp-lite is removed from VNDK."android-r-preview-1Jiyong Park
2020-01-24libprotobuf-cpp-lite is removed from VNDK.Jiyong Park
It is demoted to vendor_available library. Therefore it will be installed to /vendor/lib[64] instead of /system/lib[64]/vndk. Exempt-From-Owner-Approval: cherry-pick from internal Bug: 147780271 Test: m Merged-In: Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d Change-Id: Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d (cherry picked from commit c4516c078ddb38bcfd301e1183a1854e444c5bd3)
2020-01-24[automerger skipped] libprotobuf-cpp-lite is removed from VNDK. am: ↵Automerger Merge Worker
4d7991c2bf -s ours am skip reason: Change-Id Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d with SHA-1 c4516c078d is in history Change-Id: Iafd30bcdc13181ca74a857cdfc0ae4331ca828ce
2020-01-23libprotobuf-cpp-lite is removed from VNDK.Jiyong Park
It is demoted to vendor_available library. Therefore it will be installed to /vendor/lib[64] instead of /system/lib[64]/vndk. Exempt-From-Owner-Approval: cherry-pick Bug: 147780271 Test: m Merged-In: Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d Change-Id: Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d (cherry picked from commit c4516c078ddb38bcfd301e1183a1854e444c5bd3)
2020-01-21libprotobuf-cpp-lite is removed from VNDK.Jiyong Park
It is demoted to vendor_available library. Therefore it will be installed to /vendor/lib[64] instead of /system/lib[64]/vndk. Bug: 147780271 Test: m Change-Id: Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d
2020-01-20Merge "libprotobuf-cpp-full is removed from VNDK." am: 2f9cf7711d am: ↵Automerger Merge Worker
cc8260dd79 am: a49a141b76 Change-Id: I96fb28ff68c8bdd59e85d5f272394c197ed11788
2020-01-20Merge "libprotobuf-cpp-full is removed from VNDK." am: 2f9cf7711d am: cc8260dd79Automerger Merge Worker
Change-Id: I38f6e31b34e9b3decd2530d3e2f60270a5102799
2020-01-19Merge "libprotobuf-cpp-full is removed from VNDK."Jiyong Park
am: 2f9cf7711d Change-Id: I4ad379d773542d9f077c5820c7a6ff228241bf78
2020-01-20Merge "libprotobuf-cpp-full is removed from VNDK."Treehugger Robot
2020-01-17libprotobuf-cpp-full is removed from VNDK.Jiyong Park
It is demoted to vendor_avaialble library. Therefore it will be installed to /vendor/lib[64] instead of /system/lib[64]/vndk. Bug: 147780271 Test: m Change-Id: Iebb2fe49cf3a9b8f437fd831ea322d22001e8c90
2019-11-21Merge "Define host library for the proto compiler plugins" am: 62da9ea31b ↵Alexander Smundak
am: e6ebc68a04 am: ff1e92a952 Change-Id: I9014e14d6abdecedc5c968c7a9d4dd8881f4622b
2019-11-21Merge "Define host library for the proto compiler plugins" am: 62da9ea31bAlexander Smundak
am: e6ebc68a04 Change-Id: I34fcc52ccc2ce5e7d04182da8b6ea953cb21ea51
2019-11-21Merge "Define host library for the proto compiler plugins"bender-v1-stableAlexander Smundak
am: 62da9ea31b Change-Id: I0ab320c99a78ce598373e528f29ceb12895324c0
2019-11-21Merge "Define host library for the proto compiler plugins"Alexander Smundak
2019-11-21Define host library for the proto compiler pluginsSasha Smundak
Bug: 143574580 Test: build Change-Id: Ib89d70e88a7dafa44dfaed5b375893281ca80db4
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 6ed93712eb am: a9c5f31c04 -s ours am skip reason: subject contains skip directive Change-Id: I4510613a6b0df5ee29ad40fee1431699edd9591c
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 6ed93712eb Change-Id: I3019fbbc106d73e86e71688a422b594abc13fc8e
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I4e6167cbd6a0e21bfdf7621396fc071712a3c293
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875e am: ↵Colin Cross
f44a31bef1 am: 8df6fdec35 am: 67e73a02f7 Change-Id: Ie03061b8270239286d111abd9197da0aec27bbee
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875e am: f44a31bef1Colin Cross
am: 8df6fdec35 Change-Id: Ic4af57ad74e636baa2c7f3ca12ccc2fca5e9dc00
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875eColin Cross
am: f44a31bef1 Change-Id: I2b62b561af2ace5b94bff41e465ffea7d9e19099
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full"Colin Cross
am: b6ad51875e Change-Id: Ieb76764819b8eea86ab03812a5bec428f2cc460b
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full"Treehugger Robot
2019-10-25Use full protobuf for libprotobuf-cpp-fullColin Cross
Soong was incorrectly defaulting to compiling for full protos but using the lite runtime, and is switching to compiling for lite protos by default. Explicitly select full protos here. Bug: 119714316 Test: m checkbuild Change-Id: I8bb3fcf0c8d05172c4dace2a46574bbe7024884b
2019-10-11Merge "Remove stale README.version" am: 3bd9ad6d39 am: 4c8cd50a3c am: fcae7935f5Primiano Tucci
am: 345bd84105 Change-Id: Iacaec38c6f441df223725064ec32a39d53702f1f
2019-10-11Merge "Remove stale README.version" am: 3bd9ad6d39 am: 4c8cd50a3cPrimiano Tucci
am: fcae7935f5 Change-Id: I97ef01acb8a2da5cb75176342f1513cc851582e2
2019-10-11Merge "Remove stale README.version" am: 3bd9ad6d39Primiano Tucci
am: 4c8cd50a3c Change-Id: I877f2061555b622142c5fa86bbe514d803a13254
2019-10-11Merge "Remove stale README.version"Primiano Tucci
am: 3bd9ad6d39 Change-Id: Ic7c60b0882cbf28587ed59f61bfe9072df94fd9d
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 23:11:41 +0000