summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2018-03-06Merge "Don't force libcore_private.stubs to be built with java 1.7"android-p-preview-1android-o-mr1-iot-preview-7caf/aosp-new/o-mr1-iot-preview-7Treehugger Robot1-5/+5
2018-03-07Don't force libcore_private.stubs to be built with java 1.7Jiyong Park1-5/+5
2018-03-06Merge "libcore_private.stubs is uninstallable"Treehugger Robot1-0/+1
2018-03-07libcore_private.stubs is uninstallableJiyong Park1-0/+1
2018-03-06Merge "libcore_private.stubs cannot be built with JDK9"Treehugger Robot1-0/+3
2018-03-06libcore_private.stubs cannot be built with JDK9Jiyong Park1-0/+3
2018-03-05Merge "Build libprotobuf-java-lite only using core Java SDK APIs"Treehugger Robot2-1/+57
2018-03-05Build libprotobuf-java-lite only using core Java SDK APIsJiyong Park2-1/+57
2018-02-27Merge "Add zlib support to protobuf"Treehugger Robot1-73/+75
2018-02-13Add zlib support to protobufDan Willemsen1-73/+75
2018-02-08Merge "Include <byteswap.h> on Android."Treehugger Robot1-2/+2
2018-02-07Include <byteswap.h> on Android.Andreas Gampe1-2/+2
2018-01-16Merge "const FieldDescriptorCompare"android-wear-8.0.0_r1Treehugger Robot3-6/+10
2018-01-16const FieldDescriptorCompareRoss Wang3-6/+10
2018-01-04Merge "Move protobuf from stlport to libc++."Treehugger Robot1-2/+2
2018-01-03Move protobuf from stlport to libc++.Dan Albert1-2/+2
2018-01-02Merge "Remove unused protobuf module."Treehugger Robot1-15/+0
2017-12-20Remove unused protobuf module.Dan Albert1-15/+0
2017-12-07Merge "Improve libprotoc support for plugins"Treehugger Robot1-0/+2
2017-12-07Improve libprotoc support for pluginsAndrew Scull1-0/+2
2017-11-30Merge "Add -Werror for android target."Chih-hung Hsieh1-0/+3
2017-11-30Merge "Add -Werror for android target."Chih-hung Hsieh1-0/+3
2017-11-28Add -Werror for android target.Chih-Hung Hsieh1-0/+3
2017-11-21Merge "Explicit -Wno-error in external/protobuf"Chih-hung Hsieh1-2/+2
2017-11-21Merge "Explicit -Wno-error in external/protobuf"android-o-mr1-iot-preview-6caf/aosp-new/o-mr1-iot-preview-6Chih-hung Hsieh1-2/+2
2017-11-20Explicit -Wno-error in external/protobufChih-Hung Hsieh1-2/+2
2017-10-12Merge "Use -Werror in external/protobuf" am: 472a4b15fd am: bcc5a4247cChih-hung Hsieh1-0/+27
2017-10-12Merge "Use -Werror in external/protobuf" am: 472a4b15fdChih-hung Hsieh1-0/+27
2017-10-12Merge "Use -Werror in external/protobuf"Chih-hung Hsieh1-0/+27
2017-10-12Merge "Use -Werror in external/protobuf"Chih-hung Hsieh1-0/+27
2017-10-04Use -Werror in external/protobufChih-Hung Hsieh1-0/+27
2017-10-03Merge "Convert protobuf runtimes to Android.bp" am: 78b40ce731 am: 4e95f9e84eColin Cross2-134/+129
2017-10-03Merge "Convert protobuf runtimes to Android.bp" am: 78b40ce731Colin Cross2-134/+129
2017-10-03Merge "Convert protobuf runtimes to Android.bp"Colin Cross2-134/+129
2017-10-03Merge "Convert protobuf runtimes to Android.bp"Colin Cross2-134/+129
2017-10-01Convert protobuf runtimes to Android.bpColin Cross2-134/+129
2017-09-29Merge "Rename libz-host -> libz" am: e68c129c44 am: 41d3b5fafaDan Willemsen1-12/+5
2017-09-29Merge "Rename libz-host -> libz" am: e68c129c44Dan Willemsen1-12/+5
2017-09-28Merge "Rename libz-host -> libz"Dan Willemsen1-12/+5
2017-09-28Merge "Rename libz-host -> libz"Dan Willemsen1-12/+5
2017-09-27Rename libz-host -> libzDan Willemsen1-12/+5
2017-09-14Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: da30efac88 am: 3...Justin Yun0-0/+0
2017-09-14Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: da30efac88Justin Yun1-0/+6
2017-09-14Merge "Mark the module as VNDK or VNDK-SP in Android.bp"Justin Yun1-0/+6
2017-09-14Merge "Mark the module as VNDK or VNDK-SP in Android.bp"Treehugger Robot1-0/+6
2017-09-07Mark the module as VNDK or VNDK-SP in Android.bpJustin Yun1-0/+6
2017-09-06Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL" am: 5ba868111...Yifan Hong0-0/+0
2017-09-06Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL" am: 5ba868111...Yifan Hong0-0/+0
2017-09-06Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"Yifan Hong0-0/+0
2017-09-06Merge "Wrap liblog dependency in GOOGLE_PROTOBUF_MIN_LOG_LEVEL"android-o-mr1-preview-2android-o-mr1-preview-1Treehugger Robot1-0/+2