summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2019-12-17Merge "Snap for 6079754 from e6ebc68a04883e79701373894a8eceb142b9c258 to simp...caf/aosp-new/simpleperf-releaseandroid-build-prod (mdb)1-2/+29
2019-12-17Snap for 6079754 from e6ebc68a04883e79701373894a8eceb142b9c258 to simpleperf-...android-build-prod (mdb)1-2/+29
2019-11-21Merge "Define host library for the proto compiler plugins"bender-v1-stableAlexander Smundak1-2/+29
2019-11-21Merge "Define host library for the proto compiler plugins"Alexander Smundak1-2/+29
2019-11-21Define host library for the proto compiler pluginsSasha Smundak1-2/+29
2019-11-06Merge "Snap for 5991463 from b6ad51875e54200ae19128e82bd45545b9e71ed6 to simp...android-build-prod (mdb)1-0/+1
2019-11-06Snap for 5991463 from b6ad51875e54200ae19128e82bd45545b9e71ed6 to simpleperf-...android-build-prod (mdb)1-0/+1
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li0-0/+0
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full"Colin Cross1-0/+1
2019-10-28Merge "Use full protobuf for libprotobuf-cpp-full"Treehugger Robot1-0/+1
2019-10-25Use full protobuf for libprotobuf-cpp-fullColin Cross1-0/+1
2019-10-15Merge "Snap for 5939533 from 3bd9ad6d3992f75482e4a5130bad06636b60d293 to simp...android-build-prod (mdb)1-3/+0
2019-10-15Snap for 5939533 from 3bd9ad6d3992f75482e4a5130bad06636b60d293 to simpleperf-...android-build-prod (mdb)1-3/+0
2019-10-11Merge "Remove stale README.version"Primiano Tucci1-3/+0
2019-10-11Merge "Remove stale README.version"Treehugger Robot1-3/+0
2019-10-11Remove stale README.versionPrimiano Tucci1-3/+0
2019-10-11Merge "Snap for 5933730 from 195a9e42db8985bed3100a801c31da04acd7842d to simp...android-build-prod (mdb)2179-160050/+409445
2019-10-11Snap for 5933730 from 195a9e42db8985bed3100a801c31da04acd7842d to simpleperf-...android-build-prod (mdb)2179-160050/+409445
2019-09-30Merge "libprotobuf_vendor_suffix_test requires root to run." am: 195a9e42db a...Dan Shi1-0/+3
2019-09-30Merge "libprotobuf_vendor_suffix_test requires root to run." am: 195a9e42dbDan Shi1-0/+3
2019-09-30Merge "libprotobuf_vendor_suffix_test requires root to run."Dan Shi1-0/+3
2019-09-30Merge "libprotobuf_vendor_suffix_test requires root to run."caf/aosp-new/ndk-sysroot-r21Treehugger Robot1-0/+3
2019-09-30libprotobuf_vendor_suffix_test requires root to run.Dan Shi1-0/+3
2019-09-11Merge changes from topic "protobuf-3.9.1" am: 3bc2bb9b29 am: 20b0d10abeColin Cross5-0/+98
2019-09-11Add missing override to ~GeneratedExtensionFinder() am: ff3160af28 am: 000cad...Colin Cross1-1/+1
2019-09-11Fix unused parameter warning in clang with NDEBUG am: 12e02ca37c am: c585a822b6Colin Cross1-1/+3
2019-09-11UPSTREAM: Fix unused-parameter clang warnings in arena.h and map_type_handler...Ben Bader2-0/+2
2019-09-11Remove libprotobuf-cpp-*-rtti modules am: e64f627d92 am: e9a394525eColin Cross1-26/+0
2019-09-11Autodetect rtti am: 86f6daa94b am: 475ac1e625Colin Cross2-9/+7
2019-09-11Compile javanano as a plugin am: ff2036e1df am: d6e7c0faf0Colin Cross4-4/+39
2019-09-11Restore javanano files that were removed upstream am: 6bf5da7034 am: 5cd986fd27Colin Cross60-0/+16929
2019-09-11Revert "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL" am: 94596c38...Colin Cross1-2/+0
2019-09-11Update stubs am: f3c1b635c0 am: 56251e4165Colin Cross1-1/+23
2019-09-11Update javamicro to compile against v3.9.1 am: a80b47b857 am: 5116e527bdColin Cross16-53/+48
2019-09-11Update Android.bp to match BUILD am: ef240b2e23 am: 0176d11802Colin Cross1-119/+121
2019-09-11Add METADATA file and make NOTICE a symlink to LICENSE am: ed3d33fd78 am: e24...Colin Cross2-33/+18
2019-09-11Rerun configure am: 1467d8ec88 am: cec3029873Colin Cross2-52/+46
2019-09-11Merge tag 'v3.9.1' into master am: e949bf9b40 am: c918cd6b02Colin Cross1731-148819/+214546
2019-09-11Re-apply merge of tag v3.5.2 am: 3ed2fc5237 am: 7b4fd6195fColin Cross1475-69213/+235989
2019-09-11Revert "Backport upstream changes to allow printing field names verbatim." am...Colin Cross9-145/+6
2019-09-11Revert "Remove 2 usage of isspace as they are not stl port compatible" am: b0...Colin Cross1-2/+2
2019-09-11Revert "Use GOOGLE_CHECK Macro for validation" am: df82d5ca7d am: 3739708afbColin Cross2-6/+6
2019-09-11Revert "Emit macros with proper parentheses." am: 20e091a5d4 am: 9a43a060bbColin Cross2-10/+10
2019-09-11Revert "Generate syntactically correct java for imports from classes with no ...Colin Cross1-5/+3
2019-09-11Revert "Fix some unused parameter warnings" am: 38461bbb3e am: fcce20680dColin Cross2-5/+5
2019-09-11Revert "protobuf: work around a static analyzer bug" am: d74bf36d04 am: 7df20...Colin Cross1-4/+1
2019-09-11Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning." am: ...Colin Cross2-2/+1
2019-09-11Merge changes from topic "protobuf-3.9.1" am: 3bc2bb9b29Colin Cross5-0/+98
2019-09-11Add missing override to ~GeneratedExtensionFinder() am: ff3160af28Colin Cross1-1/+1
2019-09-11Fix unused parameter warning in clang with NDEBUG am: 12e02ca37cColin Cross1-1/+3