aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 6877830 from 43e6f74c3dd6bb1f6e97111e31206f8cb8c7a438 to sdk-...sdk-releaseandroid-build-prod (mdb)2020-10-011-0/+3
|\
| * Snap for 6877830 from 43e6f74c3dd6bb1f6e97111e31206f8cb8c7a438 to sdk-releaseandroid-build-prod (mdb)2020-10-011-0/+3
|/|
| * Merge "Merge Android R"HEADmasterXin Li2020-09-101-0/+3
| |\
| | * Merge Android RXin Li2020-09-081-0/+3
| |/|
| | * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-271-0/+3
| |/|
| | * [automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge am...Victor Khimenko2020-07-140-0/+0
| | |\
| | | * Make libprotobuf-cpp-full buildable for native_bridgeandroid11-devVictor Khimenko2020-07-101-0/+2
| | * | Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd ...Victor Khimenko2020-07-031-0/+2
| | |\ \ | | |/ / | |/| |
| * | | Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fdVictor Khimenko2020-07-031-0/+2
| |\ \ \
| | | * | Set apex_available for libprotobuf-java-lite. am: 577f4f4c79waynema2020-06-181-0/+1
| | | |\|
| | | | * Set apex_available for libprotobuf-java-lite.waynema2020-06-171-0/+1
| | | * | [automerger skipped] Set min_sdk_version to be part of mainline modules am: 4...Jooyung Han2020-04-270-0/+0
| | | |\|
| | | | * Set min_sdk_version to be part of mainline modulesJooyung Han2020-04-271-0/+1
| | | * | Merge "Set min_sdk_version to be part of mainline modules" am: 8ccc54a794 am:...Jooyung Han2020-04-251-0/+1
| | | |\ \ | | |_|/ / | |/| | |
| | | * | [automerger skipped] make libprotobuf-java-lite available to com.android.wifi...Jiyong Park2020-04-210-0/+0
| | | |\|
| | | | * make libprotobuf-java-lite available to com.android.wifi APEXJiyong Park2020-04-201-0/+1
| | | * | [automerger skipped] Set apex_available property am: d1acb170e3 -s oursJiyong Park2020-04-210-0/+0
| | | |\|
| | | | * Set apex_available propertyJiyong Park2020-04-201-4/+20
| | | * | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | | |\ \
| | | * | | make libprotobuf-java-lite available to com.android.wifi APEXJiyong Park2020-04-011-0/+1
| | | * | | Merge "Move most protoc sources to libprotoc" am: df8e697966 am: 9a004f6509Treehugger Robot2020-03-301-75/+37
| | | |\ \ \
| | | * \ \ \ Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06 am: 71dbd4fd4eTreehugger Robot2020-03-281-1/+0
| | | |\ \ \ \
| | | * \ \ \ \ [automerger skipped] Merge "Set apex_available property" am: 6645f5c5d0 am: c...Jiyong Park2020-03-230-0/+0
| | | |\ \ \ \ \
| | | * | | | | | Set apex_available propertyJiyong Park2020-03-231-4/+20
| | | * | | | | | Merge "Fix comment in protobuf METADATA" am: 575bb1eeeb am: e3b9a2ce3dHaibo Huang2020-03-211-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Allow protobufutils to be linked from apexJeffrey Huang2020-02-141-0/+2
| | | * | | | | | | Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307 am: 24761...Automerger Merge Worker2020-02-111-0/+5
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3 am: 3f23491f86 am: fc12...Automerger Merge Worker2020-02-072-0/+10
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ [automerger skipped] Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7...Automerger Merge Worker2020-01-240-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ [automerger skipped] libprotobuf-cpp-lite is removed from VNDK. am: 4d7991c2b...Automerger Merge Worker2020-01-240-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | libprotobuf-cpp-lite is removed from VNDK.Jiyong Park2020-01-211-3/+0
| | | * | | | | | | | | | | Merge "libprotobuf-cpp-full is removed from VNDK." am: 2f9cf7711d am: cc8260d...Automerger Merge Worker2020-01-201-3/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Define host library for the proto compiler plugins" am: 62da9ea31b am:...Alexander Smundak2019-11-211-2/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Use full protobuf for libprotobuf-cpp-full" am: b6ad51875e am: f44a31b...Colin Cross2019-10-281-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove stale README.version" am: 3bd9ad6d39 am: 4c8cd50a3c am: fcae7935f5Primiano Tucci2019-10-111-3/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "libprotobuf_vendor_suffix_test requires root to run." am: 195a9e42db a...Dan Shi2019-09-301-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge changes from topic "protobuf-3.9.1" am: 3bc2bb9b29...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Add missing override to ~GeneratedExtensionFinder() am: ...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Fix unused parameter warning in clang with NDEBUG am: 12...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] UPSTREAM: Fix unused-parameter clang warnings in arena.h...Ben Bader2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Remove libprotobuf-cpp-*-rtti modules am: e64f627d92 am:...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Autodetect rtti am: 86f6daa94b am: 475ac1e625 am: 0c9411...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Compile javanano as a plugin am: ff2036e1df am: d6e7c0fa...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Restore javanano files that were removed upstream am: 6b...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LO...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Update stubs am: f3c1b635c0 am: 56251e4165 am: 3743c8608bColin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Update javamicro to compile against v3.9.1 am: a80b47b85...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Update Android.bp to match BUILD am: ef240b2e23 am: 0176...Colin Cross2019-09-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \