| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "Snap for 6877830 from 43e6f74c3dd6bb1f6e97111e31206f8cb8c7a438 to sdk-...sdk-release | android-build-prod (mdb) | 2020-10-01 | 1 | -0/+3 |
| |\ | |||||
| | * | Snap for 6877830 from 43e6f74c3dd6bb1f6e97111e31206f8cb8c7a438 to sdk-release | android-build-prod (mdb) | 2020-10-01 | 1 | -0/+3 |
| |/| | |||||
| | * | Merge "Merge Android R"HEADmaster | Xin Li | 2020-09-10 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Merge Android R | Xin Li | 2020-09-08 | 1 | -0/+3 |
| | |/| | |||||
| | | * | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) | Xin Li | 2020-08-27 | 1 | -0/+3 |
| | |/| | |||||
| | | * | [automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge am... | Victor Khimenko | 2020-07-14 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | Make libprotobuf-cpp-full buildable for native_bridgeandroid11-dev | Victor Khimenko | 2020-07-10 | 1 | -0/+2 |
| | | * | | Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd ... | Victor Khimenko | 2020-07-03 | 1 | -0/+2 |
| | | |\ \ | | |/ / | |/| | | |||||
| | * | | | Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd | Victor Khimenko | 2020-07-03 | 1 | -0/+2 |
| | |\ \ \ | |||||
| | | | * | | Set apex_available for libprotobuf-java-lite. am: 577f4f4c79 | waynema | 2020-06-18 | 1 | -0/+1 |
| | | | |\| | |||||
| | | | | * | Set apex_available for libprotobuf-java-lite. | waynema | 2020-06-17 | 1 | -0/+1 |
| | | | * | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: 4... | Jooyung Han | 2020-04-27 | 0 | -0/+0 |
| | | | |\| | |||||
| | | | | * | Set min_sdk_version to be part of mainline modules | Jooyung Han | 2020-04-27 | 1 | -0/+1 |
| | | | * | | Merge "Set min_sdk_version to be part of mainline modules" am: 8ccc54a794 am:... | Jooyung Han | 2020-04-25 | 1 | -0/+1 |
| | | | |\ \ | | |_|/ / | |/| | | | |||||
| | | | * | | [automerger skipped] make libprotobuf-java-lite available to com.android.wifi... | Jiyong Park | 2020-04-21 | 0 | -0/+0 |
| | | | |\| | |||||
| | | | | * | make libprotobuf-java-lite available to com.android.wifi APEX | Jiyong Park | 2020-04-20 | 1 | -0/+1 |
| | | | * | | [automerger skipped] Set apex_available property am: d1acb170e3 -s ours | Jiyong Park | 2020-04-21 | 0 | -0/+0 |
| | | | |\| | |||||
| | | | | * | Set apex_available property | Jiyong Park | 2020-04-20 | 1 | -4/+20 |
| | | | * | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st... | Xin Li | 2020-04-10 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | | | * | | | make libprotobuf-java-lite available to com.android.wifi APEX | Jiyong Park | 2020-04-01 | 1 | -0/+1 |
| | | | * | | | Merge "Move most protoc sources to libprotoc" am: df8e697966 am: 9a004f6509 | Treehugger Robot | 2020-03-30 | 1 | -75/+37 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06 am: 71dbd4fd4e | Treehugger Robot | 2020-03-28 | 1 | -1/+0 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | [automerger skipped] Merge "Set apex_available property" am: 6645f5c5d0 am: c... | Jiyong Park | 2020-03-23 | 0 | -0/+0 |
| | | | |\ \ \ \ \ | |||||
| | | | * | | | | | | Set apex_available property | Jiyong Park | 2020-03-23 | 1 | -4/+20 |
| | | | * | | | | | | Merge "Fix comment in protobuf METADATA" am: 575bb1eeeb am: e3b9a2ce3d | Haibo Huang | 2020-03-21 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901... | Xin Li | 2020-03-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | | * | | | | | | | Allow protobufutils to be linked from apex | Jeffrey Huang | 2020-02-14 | 1 | -0/+2 |
| | | | * | | | | | | | Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307 am: 24761... | Automerger Merge Worker | 2020-02-11 | 1 | -0/+5 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3 am: 3f23491f86 am: fc12... | Automerger Merge Worker | 2020-02-07 | 2 | -0/+10 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | [automerger skipped] Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7... | Automerger Merge Worker | 2020-01-24 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | [automerger skipped] libprotobuf-cpp-lite is removed from VNDK. am: 4d7991c2b... | Automerger Merge Worker | 2020-01-24 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | libprotobuf-cpp-lite is removed from VNDK. | Jiyong Park | 2020-01-21 | 1 | -3/+0 |
| | | | * | | | | | | | | | | | Merge "libprotobuf-cpp-full is removed from VNDK." am: 2f9cf7711d am: cc8260d... | Automerger Merge Worker | 2020-01-20 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge "Define host library for the proto compiler plugins" am: 62da9ea31b am:... | Alexander Smundak | 2019-11-21 | 1 | -2/+29 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915... | Xin Li | 2019-10-30 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875e am: f44a31b... | Colin Cross | 2019-10-28 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Remove stale README.version" am: 3bd9ad6d39 am: 4c8cd50a3c am: fcae7935f5 | Primiano Tucci | 2019-10-11 | 1 | -3/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "libprotobuf_vendor_suffix_test requires root to run." am: 195a9e42db a... | Dan Shi | 2019-09-30 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Merge changes from topic "protobuf-3.9.1" am: 3bc2bb9b29... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Add missing override to ~GeneratedExtensionFinder() am: ... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Fix unused parameter warning in clang with NDEBUG am: 12... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] UPSTREAM: Fix unused-parameter clang warnings in arena.h... | Ben Bader | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Remove libprotobuf-cpp-*-rtti modules am: e64f627d92 am:... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Autodetect rtti am: 86f6daa94b am: 475ac1e625 am: 0c9411... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Compile javanano as a plugin am: ff2036e1df am: d6e7c0fa... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Restore javanano files that were removed upstream am: 6b... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LO... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Update stubs am: f3c1b635c0 am: 56251e4165 am: 3743c8608b | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Update javamicro to compile against v3.9.1 am: a80b47b85... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Update Android.bp to match BUILD am: ef240b2e23 am: 0176... | Colin Cross | 2019-09-11 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
