summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospHEADq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21mastermainandroid12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: b784c433a1 Change-Id: I11633cfd5b45107c1d625640642c0f36c8929d76
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Id4be18c4f980d7d00e79b203a87aceb8da23382f
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I0e65776e64f451cd1778a5e02b578a77acae33c5
2019-01-17Add default code reviewers into OWNERS am: 0609351c74 am: 4846753e02Chih-Hung Hsieh
am: e84e93c88c Change-Id: Ifad1511a44a43eb7463701f0e88573ba65178c96
2019-01-17Add default code reviewers into OWNERS am: 0609351c74Chih-Hung Hsieh
am: 4846753e02 Change-Id: I75b17d02a61c7b18c7111cc05525c03b7f4d58b5
2019-01-17Add default code reviewers into OWNERSChih-Hung Hsieh
am: 0609351c74 Change-Id: I15eba8b40d615d014e9f1951ac3c4b3d99dfd4b1
2019-01-17Add default code reviewers into OWNERSandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I12e71475020f28ce997c738bf4edccd7048d70b4
2018-11-06Revert "Merge tag 'v3.0.1-javalite'" am: 61f5732738 am: 8b458c474fColin Cross
am: eefb73c468 Change-Id: I1ab770e8b82dcb2e520ccac4c30086567e97c835
2018-11-06Revert "Add Android files" am: da247c697d am: ff2d9dbaa8Colin Cross
am: f2d4b7cf17 Change-Id: Ia2d39cd859dd856ce13e4791b93ef7cebb826101
2018-11-06Revert "Remove unused reference to missing sun.misc.Unsafe method" am: ↵Colin Cross
d6c856a065 am: a06112a869 am: ab9e012fd5 Change-Id: I9d889def810d8dd5ef8bde2e6f2b6abc13e365fa
2018-11-06Revert "Merge tag 'v3.0.1-javalite'" am: 61f5732738Colin Cross
am: 8b458c474f Change-Id: I4b06655eee88b2d4e9d5f8ce1743d693d83858d2
2018-11-06Revert "Add Android files" am: da247c697dColin Cross
am: ff2d9dbaa8 Change-Id: If78fb436ee5e09ab1b03c66d4c989c917304196c
2018-11-06Revert "Remove unused reference to missing sun.misc.Unsafe method" am: ↵Colin Cross
d6c856a065 am: a06112a869 Change-Id: Ib12a386f5855bcc2510f9e273ffb12c6e70b9f79
2018-11-06Revert "Merge tag 'v3.0.1-javalite'"Colin Cross
am: 61f5732738 Change-Id: I9cdbe388c87aaab8ca881949f1ed7888dfcb603f
2018-11-06Revert "Add Android files"Colin Cross
am: da247c697d Change-Id: Ifb39580fb0ebc0e386da84f094d43fd60c741af4
2018-11-06Revert "Remove unused reference to missing sun.misc.Unsafe method"Colin Cross
am: d6c856a065 Change-Id: Ic2b89099a3297b136fc5d56c267bc4b4033d779b
2018-11-04Remove unused reference to missing sun.misc.Unsafe method am: 7664db57a5 am: ↵Colin Cross
f5796f9501 am: ce6668c32a Change-Id: I054aa35715f3821a362d940592a1aecc6daf6fca
2018-11-04Add Android files am: 2942be007a am: 560791a7acColin Cross
am: d16f236af7 Change-Id: I0075ad9f8ad197659fe6c1a298b5cf7d23782ef5
2018-11-04Merge tag 'v3.0.1-javalite' am: f4fe6ab672 am: de855a84c0Colin Cross
am: a4b09b4fcf Change-Id: Idf13144a47889aeaff434260021bfe2f45285b8c
2018-11-04Remove unused reference to missing sun.misc.Unsafe method am: 7664db57a5Colin Cross
am: f5796f9501 Change-Id: I5a374252612141fd30e1dbc07bf733442ab22c8b
2018-11-04Add Android files am: 2942be007aColin Cross
am: 560791a7ac Change-Id: I228b3aa5c3460f5452579f695c858360e8b9c017
2018-11-04Merge tag 'v3.0.1-javalite' am: f4fe6ab672Colin Cross
am: de855a84c0 Change-Id: I0ec355ecb07253b246e873ac7567b5ca209f408a
2018-11-04Remove unused reference to missing sun.misc.Unsafe methodColin Cross
am: 7664db57a5 Change-Id: Ifa6ec20fbb5f4bd5d7581aa93a5161c1c49d3aad
2018-11-04Add Android filesColin Cross
am: 2942be007a Change-Id: Ifad7432010cade07c09d411043227cae2e0362af
2018-11-04Merge tag 'v3.0.1-javalite'Colin Cross
am: f4fe6ab672 Change-Id: Ia6204209550ecc61ae07e90d854bc07ba6ee2b0c
2018-11-04Revert "Merge tag 'v3.0.1-javalite'"android-wear-8.0.0_r2Colin Cross
This reverts commit f4fe6ab6726e235448020c5fd203e4fc1dad728e, reversing changes made to 6e463f53f1f82dfe0a74e25ae729601a9678730c. Change-Id: I451a710a7b755868c8d6a8de56a0b9bb55fedad6
2018-11-04Revert "Add Android files"Colin Cross
This reverts commit 2942be007a08fd597b9886c23e2298cd40fc08d5. Change-Id: If07013d84edc2dd2dea43896379187adb6bf8e73
2018-11-04Revert "Remove unused reference to missing sun.misc.Unsafe method"Colin Cross
This reverts commit 7664db57a53476f84f46128d6258c476433e7734. Change-Id: I30d4d35dfacaa43056b326e2c3d0cd2fd3dda7c0
2018-11-01Remove unused reference to missing sun.misc.Unsafe methodColin Cross
The copyMemory(byte[], long, byte[], long, long) method doesn't exist in sun.misc.Unsafe in Android, and leaving the dangling reference causes soft-verification errors when a jarjar'd version of libprotobuf-java-lite is included in the bootclasspath: Soft verification failures in void com.android.framework.protobuf.UnsafeUtil.copyMemory(byte[], long, byte[], long, long) void com.android.framework.protobuf.UnsafeUtil.copyMemory(byte[], long, byte[], long, long): [0x7] couldn't find method sun.misc.Unsafe.copyMemory ([BJ[BJJ)V This method is unused in the current open-source implementation of the protobuf lite runtime, so just remove it for now. Bug: 117607748 Test: m checkbuild Change-Id: Iedeeaf6fe4c278300a06a0403bd01e76a17e0cec
2018-11-01Add Android filesColin Cross
Add Android.bp, METADATA, NOTICE, and config/config.h config/config.h is generated with: $ ./autogen.sh $ ./configure $ cp config.h config/config.h Bug: 117607748 Test: m checkbuild Change-Id: Ic1070713c1169f5325e76d537a899600f4533a34
2018-10-25Merge tag 'v3.0.1-javalite'Colin Cross
Test: m checkbuild Change-Id: If5b58ea9b85a243ef67c30b182d7ce748c8eb734
2018-10-24Initial empty repositoryDiem Mai
2016-07-29Merge pull request #1877 from pherl/javaliteJisi Liu
Bump lite version 3.0.1
2016-07-28Bump lite version 3.0.1Jisi Liu
2016-07-28Merge pull request #1876 from pherl/javaliteJisi Liu
Include javadoc/source in Java release packages.
2016-07-28Include javadoc/source in Java release packages.Feng Xiao
Also fixed javadoc errors. [ci skip]
2016-07-28Merge pull request #1873 from pherl/javaliteJisi Liu
Fix Javalite Pom
2016-07-28Update maven to call the plugin to generate javalite code.Jisi Liu
2016-07-28update javalite versions.Jisi Liu
2016-07-28Merge pull request #1872 from pherl/fixwin-javaliteJisi Liu
Fix build protoc script for windows
2016-07-28Fix build protoc script for windowsJisi Liu
2016-07-26Merge pull request #1856 from pherl/javaliteJisi Liu
Add protoc-gen-javalite pom file in javalite branch.
2016-07-26Change documentation for javalite releaseJisi Liu
2016-07-26Move the protoc pom to protoc-pom.xml in the lite.Jisi Liu
This avoid accidental release the protoc using the lite branch.
2016-07-26Add a pom for javalite pluginJisi Liu
2016-07-26Merge pull request #1854 from pherl/javaliteJisi Liu
Cherry pick protoc-artifacts change into the javalite branch
2016-07-26fix comments.Jisi Liu
2016-07-26Fix the script comments.Jisi Liu
2016-07-26Make protoc-artifacts able to build plugin.Jisi Liu
2016-07-25Merge pull request #1840 from pherl/javaliteJisi Liu
Add lite plugin output to gitignore
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 06:01:16 +0000