summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-02-05Merge "Build libprotobuf-cpp-full for the host"caf/aosp-new/brillo-m10-releasecaf/aosp-new/brillo-m10-devMarie Janssen1-0/+41
2016-02-04Build libprotobuf-cpp-full for the hostMarie Janssen1-0/+41
2016-01-26Merge "Remove headers from LOCAL_SRC_FILES"Dan Willemsen1-31/+0
2016-01-25Remove headers from LOCAL_SRC_FILESDan Willemsen1-31/+0
2015-12-10Merge "Build libprotobuf-cpp-lite for the host."caf/aosp-new/brillo-m9-releasecaf/aosp-new/brillo-m9-devcaf/aosp-new/brillo-m8-releasecaf/aosp-new/brillo-m8-devAlex Deymo1-0/+42
2015-12-09Build libprotobuf-cpp-lite for the host.Alex Deymo1-0/+42
2015-12-08Merge "Basic code insertion points for javanano protocompiler plugins."Brian Duff2-0/+6
2015-12-07Basic code insertion points for javanano protocompiler plugins.Joe Covalesky2-0/+6
2015-10-22Merge "Minor cleanup in CodedInputByteBufferNano."Brian Duff1-20/+21
2015-10-22Merge "Minor cleanup in CodedInputByteBufferNano."caf/aosp-new/studio-1.2-releasecaf/aosp-new/brillo-m7-releasecaf/aosp-new/brillo-m7-mr-devcaf/aosp-new/brillo-m7-devBrian Duff1-20/+21
2015-10-22Minor cleanup in CodedInputByteBufferNano.Nathan Mittler1-20/+21
2015-09-09am c0bdb541: am ecc40a3a: Merge "Fix name for NDK protobuf libraries."Dan Albert1-31/+10
2015-09-09am ecc40a3a: Merge "Fix name for NDK protobuf libraries."Dan Albert1-31/+10
2015-09-09Merge "Fix name for NDK protobuf libraries."Dan Albert1-31/+10
2015-09-09am 50880c9b: am 1280a3a2: Merge "Add libprotobuf-cpp-lite-rtti target for the...Alex Deymo1-0/+22
2015-09-09am 1280a3a2: Merge "Add libprotobuf-cpp-lite-rtti target for the platform."Alex Deymo1-0/+22
2015-09-09Merge "Add libprotobuf-cpp-lite-rtti target for the platform."Alex Deymo1-0/+22
2015-09-08Add libprotobuf-cpp-lite-rtti target for the platform.Alex Deymo1-0/+22
2015-09-08am ca0deaf1: am ef76c066: Merge "Add *-ndk named NDK libraries."Dan Albert1-0/+17
2015-09-08am ef76c066: Merge "Add *-ndk named NDK libraries."Dan Albert1-0/+17
2015-09-08Merge "Add *-ndk named NDK libraries."Dan Albert1-0/+17
2015-09-08Fix name for NDK protobuf libraries.Dan Albert1-31/+10
2015-09-08Add *-ndk named NDK libraries.Dan Albert1-0/+17
2015-09-03am 21c47d48: am 5b142166: Merge "Stop checking HOST_OS, whitelist windows mod...Dan Willemsen1-10/+5
2015-09-03am 5b142166: Merge "Stop checking HOST_OS, whitelist windows module"Dan Willemsen1-10/+5
2015-09-02Merge "Stop checking HOST_OS, whitelist windows module"Dan Willemsen1-10/+5
2015-09-02Stop checking HOST_OS, whitelist windows moduleDan Willemsen1-10/+5
2015-09-01am 92966197: am 978f5dcd: Merge "Call super.storeUnknownField in Nano protobu...Brian Duff1-1/+1
2015-09-01am 978f5dcd: Merge "Call super.storeUnknownField in Nano protobufs."Brian Duff1-1/+1
2015-08-31Merge "Call super.storeUnknownField in Nano protobufs."Brian Duff1-1/+1
2015-08-31Call super.storeUnknownField in Nano protobufs.Giorgi Kvirkvia1-1/+1
2015-08-28am bd28b466: am 9641e6e9: Merge "Don\'t use libc++ for Windows. It doesn\'t e...Dan Albert1-2/+4
2015-08-28am 9641e6e9: Merge "Don\'t use libc++ for Windows. It doesn\'t exist."Dan Albert1-2/+4
2015-08-28Merge "Don't use libc++ for Windows. It doesn't exist."Dan Albert1-2/+4
2015-08-27Don't use libc++ for Windows. It doesn't exist.Dan Albert1-2/+4
2015-08-27am 07769c42: am 8e216366: Merge "Stop using libstdc++."Dan Albert1-3/+3
2015-08-27am 8e216366: Merge "Stop using libstdc++."Dan Albert1-3/+3
2015-08-27Merge "Stop using libstdc++."Dan Albert1-3/+3
2015-08-27Stop using libstdc++.Dan Albert1-3/+3
2015-08-27am 892ced67: am 787fc4d5: Merge "Silence -Wsign-compare warning on protobuf-l...Alex Deymo1-1/+1
2015-08-27am 787fc4d5: Merge "Silence -Wsign-compare warning on protobuf-lite headers."Alex Deymo1-1/+1
2015-08-27am cfad3ce5: (-s ours) am 2bd25081: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS fo...Daniel Erat0-0/+0
2015-08-26Merge "Silence -Wsign-compare warning on protobuf-lite headers."Alex Deymo1-1/+1
2015-08-26Silence -Wsign-compare warning on protobuf-lite headers.Alex Deymo1-1/+1
2015-07-16am 2bd25081: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."Daniel Erat1-0/+10
2015-07-16am 2bd25081: Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."Daniel Erat1-0/+10
2015-07-16Merge "Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs."android-m-preview-2Daniel Erat1-0/+10
2015-07-15Set LOCAL_EXPORT_C_INCLUDE_DIRS for shared and static libs.Daniel Erat1-0/+10
2015-07-07am 6180b684: am d7f9473d: am 1817ed30: Merge "Update CodedOutputByteBufferNan...Brian Duff0-0/+0
2015-07-07am 9eb445da: am d85b156e: am 89fa3126: Merge "Update thei Protocol Buffer des...Brian Duff0-0/+0