aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-20Add 32BIT and 16BIT nanopb library. am: 3f5b6d4262 am: aaae7fff6eandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-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_r12android10-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-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseYu Shan
am: 1d0ca59852 Change-Id: I412488a20b4fcfa05f58528c2e38fff5a7e3a0c0
2019-02-20Add 32BIT and 16BIT nanopb library. am: 3f5b6d4262Yu Shan
am: aaae7fff6e Change-Id: I7e9b49665176548ce0c7d5e5c9f3c62ec37d5650
2019-02-20Add 32BIT and 16BIT nanopb library.Yu Shan
am: 3f5b6d4262 Change-Id: I2f79eba12ecf6e8d7ab7ed2d102bbe745c0b6c0c
2019-02-19Add 32BIT and 16BIT nanopb library.android-q-preview-1android-o-mr1-iot-release-1.0.10Yu Shan
Add 32BIT and 16BIT compile time flag for nanopb library to support 16BIT or 32BIT size, default is 8BIT. User need to use the corresponding library when define the PB_FIELD_* flag during compilation. Test: None Bug: 122292884 Change-Id: I1b3c572e54297d020776e7721d37b65526f1a0ff
2019-02-04Merge Android Games SDK into master. am: 4090366181 am: eeedc9b64bXin Li
am: e80a74a431 Change-Id: I120cf2f5451910c68e9ebfad9d86358c02b32098
2019-02-04Merge Android Games SDK into master. am: 4090366181Xin Li
am: eeedc9b64b Change-Id: I3355d9aa570683a1488f528752342ce4527c6190
2019-02-04Merge Android Games SDK into master.Xin Li
am: 4090366181 Change-Id: Ic5a149eb6e898140647c92aa446f5614cfbcb7d0
2019-02-04Merge Android Games SDK into master.Xin Li
Bug: 123068679 Change-Id: I7b75d9d7c8a8980bcceafc44580fb70ce4d31938
2019-01-11Add default code reviewers into OWNERS am: b5cea29f5e am: 7ef083d766Chih-Hung Hsieh
am: be7f0300db Change-Id: Icb79d01247504977e99800b9d0ad8635d2d292d8
2019-01-11Add default code reviewers into OWNERS am: b5cea29f5eChih-Hung Hsieh
am: 7ef083d766 Change-Id: Ice842086225ed70303eb9432489888ff20a23412
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
am: b5cea29f5e Change-Id: I7ebbe28c941c8e8c91f147bc7a0981d98c946a56
2019-01-11Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I0d65423c625fd4085a88fe0fdbeaa27cb7909c43
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: c8cd40fafa -s ours am: 1457d4dfb9 -s ours am: 90df857c8f -s ours Change-Id: Iad213fa375bd4b5733d73cdabfe63aac1aade16d
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: c8cd40fafa -s ours am: 1457d4dfb9 -s ours Change-Id: I9a3c40d09131859174d46e53a127a89e9eb9917d
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: c8cd40fafa -s ours Change-Id: I47ea8b0732f1eda7547e58081b1fd0454c86e378
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: Iaa0bee4c8ee4dace87ef0ad2aee6d8537ffd101c
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: ba5d139354 -s ours am: 3ce1eb5d7a -s ours Change-Id: I5c812a72d24c30207f2d8f4f1c04c7ddac200104
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: ba5d139354 -s ours Change-Id: I84269a992148b8c4beec3aee31073eb7e62dc974
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Id358b7b183cdb993644b08f1587085f1fc672bc7
2018-08-16Add rule to generate prebuilt nanopb_generator. am: 45c9ba7693 am: 9259e0d233Yu Shan
am: 000fe611d1 Change-Id: Ifa695ac2da8e85e6bd4701a235f4a7ecab8e8b6e
2018-08-16Add legacy macro definition for precompiled files. am: c9c123244c am: 09df97cd8fYu Shan
am: 9baab47154 Change-Id: I755cc20862dbbfae027fa0ce72502301d6338160
2018-08-16[automerger skipped] Upgrade nanopb to 0.3.9.1 am: 86bd676e06 am: b0f82e0ec5Yu Shan
am: 0ccf82b82c -s ours Change-Id: I33f0216842f6fd8b3831242df8b2912adaeb6409
2018-08-16Add rule to generate prebuilt nanopb_generator. am: 45c9ba7693Yu Shan
am: 9259e0d233 Change-Id: I0a4dc46da3a6ec3ce4bb30b2905f771c2d01b25b
2018-08-16Add legacy macro definition for precompiled files. am: c9c123244cYu Shan
am: 09df97cd8f Change-Id: I321153010e313ee4794e84fa0d3d228f5454b940
2018-08-16Upgrade nanopb to 0.3.9.1 am: 86bd676e06Yu Shan
am: b0f82e0ec5 Change-Id: Ic5983e268e9a9279e159ff4e8cbb1941e5543c27
2018-08-16Add rule to generate prebuilt nanopb_generator.Yu Shan
am: 45c9ba7693 Change-Id: I45aa867009a3133da943e5b70c265098c70a770f
2018-08-16Add legacy macro definition for precompiled files.Yu Shan
am: c9c123244c Change-Id: I9e92c461533bd666e4d9b89439526ffc4511fed4
2018-08-16Upgrade nanopb to 0.3.9.1Yu Shan
am: 86bd676e06 Change-Id: Ib7ddacb28606b0c063ff5e6feabb3280be25e4ee
2018-08-16Add rule to generate prebuilt nanopb_generator.android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseYu Shan
Add rule to generate prebuilt nanopb_generator to include the libprotobuf-python from external instead of host. Test: Local build tests. Bug: b/111798740 Change-Id: I9bad3b5d2988ed7c642ae4c339376874d56aa578 (cherry picked from commit bc20853921deb0f94a7b32c315be3c68fd066fb3)
2018-08-16Add legacy macro definition for precompiled files.Yu Shan
There are existing precompiled .pb.c and .pb.h files in our tree. They were compiled using nanopb 0.2.8 and 0.3.9 changes some of the macro definition. In order to be compatible with those files, we add back the legacy macro definition. Added patch is at pb.h.patch. Test: None Bug: 111798740 Change-Id: I83454ae49a77331a6d8b2471cd1e8ae80397cffd (cherry picked from commit c31a0b32ffe7748c64527e9b030d0358ad114bf7)
2018-08-16Upgrade nanopb to 0.3.9.1Yu Shan
Downloaded from https://github.com/nanopb/nanopb/archive/0.3.9.1.tar.gz Also upload generator/google to python-protobuf 3.0.0. Copied from /usr/lib/python2.7/dist-packages/google after run apt-get install python-protobuf. Remove *.so to force it to use python implementation instead of prebuilt cpp implementation. Bug: b/111798740 Test: None Change-Id: I015ab62dc72268bf473f66ae8344a789b8ed8cf2 (cherry picked from commit f880a12bd5d957e38c831dc0f2d4a99beb12e4c9)
2018-08-15Merge changes from topic "UPDATE_NANOPB_0.3.9.1"Yu Shan
* changes: Add rule to generate prebuilt nanopb_generator. Revert revert "Add legacy macro definition for precompiled files." Revert revert "Upgrade nanopb to 0.3.9.1"
2018-08-03Add rule to generate prebuilt nanopb_generator.Yu Shan
Add rule to generate prebuilt nanopb_generator to include the libprotobuf-python from external instead of host. Test: Local build tests. Bug: b/111798740 Change-Id: I9bad3b5d2988ed7c642ae4c339376874d56aa578
2018-08-03Revert revert "Add legacy macro definition for precompiled files."Yu Shan
This reverts commit d2fd0b0afe3b5e8aafcf6f97d98b1045368d69bc. Bug: b/111798740 Test: Local build tests. Change-Id: Ibff509f2cf7688ed804c54ee20ce9c7ff658d7ee
2018-08-03Revert revert "Upgrade nanopb to 0.3.9.1"Yu Shan
This reverts commit d2fd0b0afe3b5e8aafcf6f97d98b1045368d69bc. After fixing the dependency problem, this should not break the build. Test: Local build tests. Bug: b/111798740 Change-Id: If2233e9c12dc3b5e2e3421746c32a57e74ae7206
2018-08-01Revert "Upgrade nanopb to 0.3.9.1"Dan Willemsen
This reverts commit f880a12bd5d957e38c831dc0f2d4a99beb12e4c9. Reason for revert: topic broke the build Bug: b/111798740 Change-Id: I507de9f9223be0bcf126dce084e4b7061cd92f62
2018-08-01Revert "Add legacy macro definition for precompiled files."Dan Willemsen
This reverts commit c31a0b32ffe7748c64527e9b030d0358ad114bf7. Reason for revert: topic broke the build Bug: 111798740 Change-Id: Ia2943f54953d5a57a2e2ef06005b3f50cf92ea58
2018-08-01Revert "Remove namespace package init script."Dan Willemsen
This reverts commit 69365cb5ab109ed2305e46de9400ac04efac8435. Reason for revert: topic broke the build Bug: 111798740 Change-Id: Ibd6c8423ac28679e986f6c53fc832a40bac56e41
2018-08-01Remove namespace package init script.Yu Shan
Remove namespace package init script so that other version of python-protobuf on host would not be included. Test: None Bug: 111798740 Change-Id: Id7ac3ac7926f2ecdeaa034b62bc99bd545814c91
2018-08-01Add legacy macro definition for precompiled files.Yu Shan
There are existing precompiled .pb.c and .pb.h files in our tree. They were compiled using nanopb 0.2.8 and 0.3.9 changes some of the macro definition. In order to be compatible with those files, we add back the legacy macro definition. Added patch is at pb.h.patch. Test: None Bug: 111798740 Change-Id: I83454ae49a77331a6d8b2471cd1e8ae80397cffd
2018-07-28Upgrade nanopb to 0.3.9.1Yu Shan
Downloaded from https://github.com/nanopb/nanopb/archive/0.3.9.1.tar.gz Also upload generator/google to python-protobuf 3.0.0. Copied from /usr/lib/python2.7/dist-packages/google after run apt-get install python-protobuf. Remove *.so to force it to use python implementation instead of prebuilt cpp implementation. Bug: b/111798740 Test: None Change-Id: I015ab62dc72268bf473f66ae8344a789b8ed8cf2
2018-07-27Revert "Upgrade nanopb to 0.3.9.1" am: 72d4ea3f96 am: 731c7139ab am: 8863e42293Christopher Ferris
am: 6852792221 Change-Id: Idb7a880773d258ca2263ca36c372723559e78dc1
2018-07-27Revert "Add legacy macro definition for precompiled files." am: 798b76ea4d ↵Christopher Ferris
am: 1ed52a9d94 am: 85687fde93 am: 6120906293 Change-Id: Ieba020dbf296d8aa50b6f6ccd905c6b51c28e1dc
2018-07-27Revert "Upgrade nanopb to 0.3.9.1" am: 72d4ea3f96 am: 731c7139abChristopher Ferris
am: 8863e42293 Change-Id: I3de17a8721008378eb1b417a2c4b723b98a6e0e3
2018-07-27Revert "Add legacy macro definition for precompiled files." am: 798b76ea4d ↵Christopher Ferris
am: 1ed52a9d94 am: 85687fde93 Change-Id: I9ba142c29eb077ee33f1a606267d3f381e386d62
2018-07-27Revert "Upgrade nanopb to 0.3.9.1" am: 72d4ea3f96Christopher Ferris
am: 731c7139ab Change-Id: I90a1a47afc2a7bb17ef2f35c8a33963cc169174a
2018-07-27Revert "Add legacy macro definition for precompiled files." am: 798b76ea4dChristopher Ferris
am: 1ed52a9d94 Change-Id: I83470dae5e96a835f4933da6df5dd9d6fc50322c
2018-07-27Revert "Upgrade nanopb to 0.3.9.1"android-o-mr1-iot-release-1.0.3Christopher Ferris
am: 72d4ea3f96 Change-Id: Ibf05485d19cfb968c952222b92cc53b6a8268b7f
2018-07-27Revert "Add legacy macro definition for precompiled files."Christopher Ferris
am: 798b76ea4d Change-Id: I7153c89534dbd4f9451992cfa7dea63be157c1c6
2018-07-27Revert "Upgrade nanopb to 0.3.9.1"android-n-iot-release-smart-display-r2Christopher Ferris
This reverts commit 56ebba603b8b913261a40f3f61561bb728e3eaa5. Reason for revert: Caused build failures. Examples of build failures: FAILED: out/target/product/vsoc_x86/gen/STATIC_LIBRARIES/librilutils_static_intermediates/proto/hardware/ril/librilutils/proto/sap-api.pb.c /bin/bash -c "(PATH=\$PATH:out/host/linux-x86/bin out/host/linux-x86/bin/aprotoc --proto_path=. --nanopb_out=out/target/product/vsoc_x86/gen/STATIC_LIBRARIES/librilutils_static_intermediates/proto --plugin=external/nanopb-c/generator/protoc-gen-nanopb hardware/ril/librilutils/proto/sap-api.proto )" [libprotobuf WARNING external/protobuf/src/google/protobuf/compiler/parser.cc:547] No syntax specified for the proto file: hardware/ril/librilutils/proto/sap-api.proto. Please use 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. (Defaulted to proto2 syntax.) Change-Id: Id862b050b2de4410bc9facf6d9920d3e878b227e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 19:44:36 +0000