aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-01Revert "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."Colin Cross
This reverts commit 1c91b228abc0c538b3cc62454ce156f89cb71037. No longer applies against upstream. Bug: 112098107 Bug: 117607748 Test: m checkbuild Change-Id: I2dc98269aec9394c9a77189dd2a5c0a017b8a99c
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
Change-Id: I2b9a0d97847c29a9c088fad035300a52e9b6defb
2018-10-12Merge "Make the protobuf directory match closer to upstream"Colin Cross
am: 548c124a59 Change-Id: I093b671f26bf2808cc585a95d122237b72b17808
2018-10-12Merge "Make the protobuf directory match closer to upstream"android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-releaseTreehugger Robot
2018-10-11Make the protobuf directory match closer to upstreamColin Cross
Remove the outputs of the configure script that are not upstream, they don't need to be checked in. Restore .travis.yml, it doesn't hurt to have it and removing it causes conflicts. Remove gtest directory, it's not part of the protobuf git repository and we aren't using it. Remove the util directory, it's not part of the protobuf git repository and we aren't using it. Relands I1d718e9d5fa4fa4bf83419f2bf82f501b29af99e restoring build.gradle to fix unbundled gradle builds. Bug: 117607748 Test: m checkbuild Change-Id: I686e6ab844c96f019f91ea618db124f38b412875
2018-10-11Merge "Revert "Make the protobuf directory match closer to upstream""Colin Cross
am: d7492fc872 Change-Id: I22a6cae28fd49dc0da1fc53f502a04fa9428bb0d
2018-10-12Merge "Revert "Make the protobuf directory match closer to upstream""Colin Cross
2018-10-12Revert "Make the protobuf directory match closer to upstream"Colin Cross
This reverts commit e1c9d198c013c68ed0a9bc8923c6875d7f812093. Reason for revert: build.gradle is still used by unbundled gradle builds. Bug: 117607748 Change-Id: I5170999e8c0e42545d0cf7f31bee2e55fe993054
2018-10-11Merge changes I1d718e9d,Icc74ff16Colin Cross
am: 5e2ffa5ca9 Change-Id: Id81d39d89bf6abd88e0ccd132dcdfc39d1a530ba
2018-10-11Merge changes I1d718e9d,Icc74ff16Colin Cross
* changes: Make the protobuf directory match closer to upstream Merge tag v3.0.0-beta-3 into master
2018-10-11Make the protobuf directory match closer to upstreamColin Cross
Remove the outputs of the configure script that are not upstream, they don't need to be checked in. Restore .travis.yml, it doesn't hurt to have it and removing it causes conflicts. Remove gtest directory, it's not part of the protobuf git repository and we aren't using it. Remove the util directory, it's not part of the protobuf git repository and we aren't using it. Bug: 117607748 Test: m checkbuild Change-Id: I1d718e9d5fa4fa4bf83419f2bf82f501b29af99e
2018-10-11Merge tag v3.0.0-beta-3 into masterColin Cross
This merges the history from upstream protobuf 3.0.0-beta-3 (the last time our tree was updated wholesale) into master. It doesn't make any changes to the contents of the tree. Bug: 117607748 Test: m checkbuild Change-Id: Icc74ff16c0da7fecae118f6fc106337e15c0338d
2018-08-03Merge "Suppress clang-analyzer-core.uninitialized.UndefReturn warning." am: ↵Chih-hung Hsieh
a03b9a5de3 am: e9ab58d7c0 Change-Id: I1a30c3080e5a5299b212beddba8604ca08625a77
2018-08-03Merge "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3master-cuttlefish-testing-releaseChih-hung Hsieh
am: a03b9a5de3 Change-Id: I97df2a0ff28f386b76d8a793753a026de565595b
2018-08-03Merge "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."Chih-hung Hsieh
2018-08-03Suppress clang-analyzer-core.uninitialized.UndefReturn warning.Chih-Hung Hsieh
protobuf generates code with the following pattern: if (default_instance_ == NULL) protobuf_AddDesc_...();; return *default_instance_; Function protobuf_AddDesc_...() initializes several default_instance_ only in its first invocation. Since clang static analyzer cannot know that in the 2nd call to protobuf_AddDesc_...() the tested default_instance_ has been initialized before, it reports an incorrect UndefReturn warning. Bug: 112098107 Test: build with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=clang-analyzer-core.* Change-Id: I36b325f7dd465b13f28ec3beddcd4a4cf357df65
2018-07-24Merge "Add recovery_available: true to libprotobuf-cpp-lite" am: 8f8e27deefTom Cherry
am: 266c9bb486 Change-Id: I49ccc05123937f1be06dc7c360880e1b1a0965bd
2018-07-24Merge "Add recovery_available: true to libprotobuf-cpp-lite"Tom Cherry
am: 8f8e27deef Change-Id: I0c1f222d9623a12b0a72cd6b77ad70f9dcbe5fd2
2018-07-24Merge "Add recovery_available: true to libprotobuf-cpp-lite"android-n-iot-release-smart-display-r2Tom Cherry
2018-07-24Add recovery_available: true to libprotobuf-cpp-liteTom Cherry
Init needs this in order to be built in Android.bp Test: build Change-Id: Idc3bfe634e7f6cd7b1290833d6b93f3e446f574d
2018-06-14Merge "Protobuf: Suppress MissingOverride" am: f86b2973c1Andreas Gampe
am: 61e408fd31 Change-Id: Ie4b36300c5301db2e79f55929e05dda6ae482fcf
2018-06-14Merge "Protobuf: Suppress MissingOverride"Andreas Gampe
am: f86b2973c1 Change-Id: I08da11136f69c8e3e32fe0bc4303912e757521e6
2018-06-14Merge "Protobuf: Suppress MissingOverride"android-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-displayTreehugger Robot
2018-06-14Protobuf: Suppress MissingOverrideAndreas Gampe
Bug: 73499927 Test: m javac-check RUN_ERROR_PRONE=true Change-Id: I3947bf481b25a9ec5ecec5f3ad70200e1c130470
2018-05-18Merge "Add all the internal protos to the java protobuf lib" am: 3146aa7630Julien Desprez
am: a3c500d0e1 Change-Id: I0fe04b106fb5def21c095d104f4588bfb59b9fb5
2018-05-18Merge "Add all the internal protos to the java protobuf lib"Julien Desprez
am: 3146aa7630 Change-Id: I7e1dc5a7af2c0f3c2f856fdab5a23fd548d1b5b6
2018-05-18Merge "Add all the internal protos to the java protobuf lib"android-o-mr1-iot-release-1.0.1android-n-iot-release-polk-at1Julien Desprez
2018-05-18Add all the internal protos to the java protobuf libJulien Desprez
Mirror the python protobuf lib and add all the internal protos to the java lib in order to be able to use import google/protobuf/Any and such in proto definitions. Test: make host-libprotobuf-java-full Bug: 79990695 Change-Id: I3383f42b1de5cd31986cd79b6c4a82fb69fba122
2018-05-15Merge "Add SIX to Python-Protobuf dependencies" am: 8d8905924cNan Zhang
am: 2ea2d1cb10 Change-Id: Ibda1d3cb6feacd632dfc8cedb81e3ad080763a9c
2018-05-15Merge "Add SIX to Python-Protobuf dependencies"Nan Zhang
am: 8d8905924c Change-Id: I5d8b1fca71e6972bebe42b6a9ebd9be8b0b9515a
2018-05-15Merge "Add SIX to Python-Protobuf dependencies"Treehugger Robot
2018-05-15Add SIX to Python-Protobuf dependenciesNan Zhang
Test: m -j perf_proto_stack Bug: b/79751992 Change-Id: If6b85d5378334f61648e3c85372c2143d1f683ca
2018-05-02Merge "protobuf: Update path to android.jar." am: d2b211470fAnton Hansson
am: 6b7d0cfc95 Change-Id: I09b2d014d6ea0440b2d545b0042ec6bc3ed37880
2018-05-02Merge "protobuf: Update path to android.jar."Anton Hansson
am: d2b211470f Change-Id: I0763cc93a1b5d8e29cf147eff559db62ac43735c
2018-05-02Merge "protobuf: Update path to android.jar."android-wear-p-preview-2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.0Anton Hansson
2018-05-01protobuf: Update path to android.jar.Anton Hansson
It's being moved to a new location, so update the path. Test: No Bug: 77525052 Change-Id: I990f3bedb43e7c7dbd18bf67fa5daf058be20055
2018-03-23Merge "Create common protobuf libs for Python" am: 998f3ff954Nan Zhang
am: 46b2295695 Change-Id: Icfe79a56a1f5ba17852c0267669ef2ea118394dd
2018-03-23Merge "Create common protobuf libs for Python"Nan Zhang
am: 998f3ff954 Change-Id: I3f126ddb723ea6bc67b66e3582100d929863c958
2018-03-23Merge "Create common protobuf libs for Python"android-o-mr1-iot-preview-8android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8Treehugger Robot
2018-03-20Create common protobuf libs for PythonNan Zhang
Bug: b/70568913 Test: manually create examples. Change-Id: I63e94d6066ea4a09206b497f6181799b6e478fdc
2018-03-08Snap for 4641295 from 411501423307c29a160affef03485fd8000b3c1d to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I5c3a5f74b7a0965d7f90fbc5938e280654e2c665
2018-03-07Build libprotobuf-java-lite only using core Java SDK APIsJiyong Park
am: 4115014233 -s ours Change-Id: Id4b34c9a4161d4c16c77f82841f0b132ee2a695d
2018-03-07Build libprotobuf-java-lite only using core Java SDK APIsandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devJiyong Park
libprotobuf-java-lite is now built against core Java APIs which excludes Android-only APIs (classes under android.* packages) and private APIs. "core_current" is a pseudo SDK which is a core Java subset of Android SDK. However, this lib has been using sun.misc.Unsafe which is a hidden API and dependency to the class doesn't seem to be able to be cut easily in the near future. In order to make it possible to build the lib with the SDK only, a stubs library called libcore_private.stubs is defined to provide build-time only information on the hidden APIs exclusively to protobuf. At runtime, the Unsafe class is provide by the OS and protobuf is linked to the class loaded there. Bug: 73204840 Test: m -j libprotobuf-java-lite is successful and does not show any link-type check warning Merged-In: I2fce2662cc65d4e57fc75bbf30ebf9f7d47c6775 (cherry picked from commit dc08924dc7262e5c06c1108f67f66e82598af806) libcore_private.stubs cannot be built with JDK9 The package sun.misc in the stubs library is causing module name conflict when building with JDK9. error: package exists in another module: jdk.unsupported Fixing the error by setting java_version to 1.7 so that modules are not used when building the stubs lib. Bug: 74211600 Test: EXPERIMENTAL_USE_OPENJDK9=true m -j libcore_private.stubs Merged-In: Ifa709bef2dc8e2b11048ef96fc7517d8c25e8a7f (cherry picked from commit 0e4379e7504849d7a2755b9a0264cd7901accc88) libcore_private.stubs is uninstallable Make sure that libcore_private.stubs isn't installed to the device as a standalone jar library. The lib is meant to provide build-time only symbol information to protobuf and thus is not runnable. Bug: 73204840 Test: m -j libcore_private.stubs does not create libcore_private.stubs.jar in /system/framework Merged-In: I7c661211161937dba5ee71fdc4bb8b9f101c5a59 (cherry picked from commit 6297aad4d72232863366d62ae8799ce9cf492a43) Don't force libcore_private.stubs to be built with java 1.7 We no longer need to build libcore_private.stubs with java 1.7, because the library is only built for target and not for host, where it conflicts with the module jdk.unsupported. Bug: 74211600 Test: m -j libprotobuf-java-lite is successful. both host and target variant of the lib is generated. Test: EXPERIMENTAL_USE_OPENJDK9=true m -j libprotobuf-java-lite is also successful. Merged-In: I61a49d537ee6abad29e5661944ffc612a94465b8 (cherry picked from commit ed6d68ed9747c96d54d6773af40060e780443b1a) Change-Id: I256652071b8a11cfbebcf6a4906546e6434f7372
2018-03-06Merge "Don't force libcore_private.stubs to be built with java 1.7" am: ↵Jiyong Park
022ab7e7c9 am: 2e49781a48 Change-Id: I4c7a2fd18908c73d429119147a7f63b8402ead6d
2018-03-06Merge "libcore_private.stubs is uninstallable" am: edf941983fJiyong Park
am: 444a11afc7 Change-Id: I82321a0bbcc07e9c84d9d2defd8e3acf963ba3a0
2018-03-06Merge "Don't force libcore_private.stubs to be built with java 1.7"Jiyong Park
am: 022ab7e7c9 Change-Id: I2ad3848d9c8cd03a728f79db48590c7eb5df42b7
2018-03-06Merge "libcore_private.stubs is uninstallable"Jiyong Park
am: edf941983f Change-Id: If70e49859abc93e0560304dc91b3d7b8e37cbe36
2018-03-06Merge "libcore_private.stubs cannot be built with JDK9" am: 6b330b5a7aJiyong Park
am: 46b04d878e Change-Id: I40920dc687b94dd55b089b96a98a0c9a60c4220f
2018-03-06Merge "libcore_private.stubs cannot be built with JDK9"Jiyong Park
am: 6b330b5a7a Change-Id: I02629ec353f8b86d030a6f58130e83f9d842b7a0
2018-03-06Merge "Don't force libcore_private.stubs to be built with java 1.7"android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 16:06:00 +0000