aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-29Merge "Snap for 11647390 from 24a7e90629553667d2c1f5f748e5c5242790f7e5 to ↵androidx-vectordrawable-releaseAndroid Build Coastguard Worker
androidx-vectordrawable-release" into androidx-vectordrawable-release
2024-03-29Snap for 11647390 from 24a7e90629553667d2c1f5f748e5c5242790f7e5 to ↵Android Build Coastguard Worker
androidx-vectordrawable-release Change-Id: Ifc9347e91e44dbb4b9708ce472e181933721a21b
2023-07-20Merge "Remove external/protobuf/.gitmodules and submodule directories" into ↵androidx-wear-wear-tooling-preview-releaseandroidx-viewpager2-releaseandroidx-tv-material-releaseandroidx-test-uiautomator-releaseandroidx-platform-releaseandroidx-mainandroidx-graphics-releaseandroidx-graphics-core-releaseandroidx-credential-releaseandroidx-core-performance-releaseandroidx-compose-material3-adaptive-releaseandroidx-compose-g3-releaseTreehugger Robot
androidx-main
2023-07-19Remove external/protobuf/.gitmodules and submodule directoriesRaman Tenneti
Android doesn't support .gitmodules in external directory. Bug: 152899985 Bug: 291321281 Test: Presubmit-Verify Change-Id: Iee741eb576083e49931519ba68e238141e1f1049 (cherry picked from commit 502feeef69907281c998288a1076e4435373a6f2)
2021-08-11Merge "Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into ↵androidx-window-extensions-core-releaseandroidx-resourceinspection-releaseandroidx-privacysandbox-ads-releaseandroidx-preference-releaseandroidx-metrics-releaseandroidx-localbroadcastmanager-releaseandroidx-health-releaseandroidx-emoji2-releaseandroidx-draganddrop-releaseandroidx-customview-customview-poolingcontainer-releaseandroidx-core-core-splashscreen-releaseandroidx-coordinatorlayout-releaseandroidx-arch-core-releaseAlan Viverette
191673756_upstream_platform" into androidx-main
2021-08-10Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into ↵Alan Viverette
191673756_upstream_platform Bug: 191673756 Test: ./gradlew bOS Change-Id: Ic0877158810743e46a3bf5b3eca21db7778b5ce4
2021-03-05Merge "Suppress inconsistent-missing-override warnings in libprotobuf in ↵androidx-platform-dev-tempAurimas Liutikas
cmake" into androidx-main am: 2ad4efceff Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1619828 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I71cd4f93bb1b8ed9c2098d10f5cdf7915b61ea66
2021-03-05Merge "Suppress inconsistent-missing-override warnings in libprotobuf in ↵androidx-wear-wear-ongoing-releaseandroidx-leanback-releaseAurimas Liutikas
cmake" into androidx-main
2021-03-04Suppress inconsistent-missing-override warnings in libprotobuf in cmakeAurimas Liutikas
Test: ./gradlew :appsearch:appsearch-local-storage:externalNativeBuildDebug in androidx builds no longer show these warnings Change-Id: I64ef31892b29139e061f0b0791534fbfa1f779fa
2020-07-21Merge changes Ic235469e,I1a1be361,I9121b112 into androidx-master-dev am: ↵Treehugger Robot
b0e0d998d2 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1363498 Change-Id: I09db41db594cb6f40070bffaf8ae61aebebebe78
2020-07-21Merge "Remove external/protobuf OWNERS for androidx-master-dev" into ↵Diego Perez
androidx-master-dev am: c79f96d205 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1363630 Change-Id: Ida7602644c52942ac4512c3783219c3ef04bf338
2020-07-21Merge changes Ic235469e,I1a1be361,I9121b112 into androidx-master-devandroidx-print-releaseandroidx-media2-media2-widget-releaseandroidx-master-releaseandroidx-master-devandroidx-exifinterface-releaseandroidx-enterprise-releaseandroidx-biometric-releaseandroidx-autofill-releaseTreehugger Robot
* changes: Not messing around with individual warnings Disable some overly-verbose warnings Updates BUILD to work in androidx-studio-integration
2020-07-21Merge "Remove external/protobuf OWNERS for androidx-master-dev" into ↵Diego Perez
androidx-master-dev
2020-07-21Remove external/protobuf OWNERS for androidx-master-devdiegoperez
This branch is maintained by the androidx team, similarly to the studio branch. Bug: 141461148 Test: N/A Exempt-From-Owner-Approval: This only affects the androidx branches. Change-Id: I638a1b010e59b85b5a1aac4d9b6a2be7237a53e7
2020-07-15Not messing around with individual warningsJoe Baker-Malone
We don't really care about warnings in here at all, since we aren't modifying it. Removing -Wall and the individual -Wno args I added earlier. Test: none, just verify there aren't so many warnings Bug: 141461148 Change-Id: Ic235469e3fa5d5375008a5813524f937b297217d
2020-07-15Disable some overly-verbose warningsJoe Baker-Malone
Also build with -std=c++11, which is required when building for android. Test: shouldn't affect build output Bug: 141461148 Change-Id: I1a1be361f4abf4bbe4a82087317f8db44f2fd751
2020-07-15Updates BUILD to work in androidx-studio-integrationdiegoperez
Reference the zlib repo used in the studio branch and include the normal configuration file. Bug: 160271731 Test: bazel build @protobuf_repo//:protobuf Change-Id: I9121b1122e78e91b73dfeec4fa6c39945928b6e0
2020-04-25Merge "Set min_sdk_version to be part of mainline modules" am: 8ccc54a794androidx-sqlite-inspection-releaseJooyung Han
Change-Id: I3fc1ad7c8b295d5024a9e69e2781f54e89842de0
2020-04-25Merge "Set min_sdk_version to be part of mainline modules"Jooyung Han
2020-04-16Set min_sdk_version to be part of mainline modulesJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Change-Id: I5bf9ceb712691916a90afcae92056d0b5875f78c
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I18a142d2452a040acfe871e3fd78dc76f13bf8fd
2020-03-30Merge "Move most protoc sources to libprotoc" am: df8e697966 am: 9a004f6509Treehugger Robot
Change-Id: I7c41b2cf3572abe673f62027f7a30ea4bf517858
2020-03-30Merge "Move most protoc sources to libprotoc" am: df8e697966Treehugger Robot
Change-Id: I1610ca52ae83ead44861dcfdc4ddf919362294fb
2020-03-30Merge "Move most protoc sources to libprotoc"androidx-swiperefreshlayout-releaseandroidx-emoji-releaseandroidx-customview-releaseTreehugger Robot
2020-03-28Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06 am: 71dbd4fd4eTreehugger Robot
Change-Id: I78aa78a8bed8784415b708ac815980f3cf2b6888
2020-03-28Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06Treehugger Robot
Change-Id: Icd01590c6ab4049a9c6759e481a6e374aeca2f40
2020-03-28Merge "Remove redundant NOTICE symbolic link."Treehugger Robot
2020-03-27Move most protoc sources to libprotocColin Cross
Match the library layout in the BUILD file by moving most of the protoc sources into libprotoc and leaving only main.cc in aprotoc. Bug: 151768015 Test: m checkbuild Change-Id: I00a6efd1f9865299c03ef84b09adffa46eab7a0f
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ib0b9ee7312631705b62abd270482c1868eb2b50f
2020-03-23Merge "Set apex_available property" am: 6645f5c5d0 am: cd3ff8ace1Jiyong Park
Change-Id: I6523b685a6de26898248a62e7a67099525ab1f88
2020-03-23Merge "Set apex_available property" am: 6645f5c5d0Jiyong Park
Change-Id: Id34e1dd069b56aa1bf093e18eded8a586d383602
2020-03-23Merge "Set apex_available property"Jiyong Park
2020-03-23Set apex_available propertyJiyong Park
The marked library(ies) were available to the APEXes via the hand-written whitelist in build/soong/apex/apex.go. Trying to remove the whitelist by adding apex_available property to the Android.bp of the libraries. Exempt-From-Owner-Approval: cp from master Bug: 150999716 Test: m Merged-In: I20a6ef3e3a95c5ebce63666e7b88623997623083 (cherry picked from commit dd6f59aad67e08ade1436125acd7008e2c75404b) Change-Id: I20a6ef3e3a95c5ebce63666e7b88623997623083
2020-03-21Merge "Fix comment in protobuf METADATA" am: 575bb1eeeb am: e3b9a2ce3dHaibo Huang
Change-Id: I718d99d15f827ac762ec667f1c0cd7e833ea37cf
2020-03-21Merge "Fix comment in protobuf METADATA" am: 575bb1eeebHaibo Huang
Change-Id: I6fc329c908e4fa0a5a46cd23cb89040b785bd807
2020-03-21Merge "Fix comment in protobuf METADATA"Haibo Huang
2020-03-21Fix comment in protobuf METADATAHaibo Huang
Exempt-From-Owner-Approval: No code change. Change-Id: I7555603832218534555b2bfb709eff1a698a97cc
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 8e765c7b3e Change-Id: I46ba06b606680b15beae4a731a1d836f2b1f1a9a
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I17ffcdefdb309d9da31e8df55bc080f374d46b65
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307 am: ↵Automerger Merge Worker
247616f215 Change-Id: Iecafb370dca48bd7b883d37ce62bb6198c4ee7c1
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I2c7e33fc78c2ba521955ec1a0998b5282215c8e5
2020-02-11Merge "Set apex_available for libprotobuf-cpp-lite."Joshua Duong
2020-02-10Set apex_available for libprotobuf-cpp-lite.Joshua Duong
Bug: 149181583 Bug: 111434128 Bug: 147364041 Test: make Change-Id: I8fa43a64a2fbe30a7e95a8e623d58a1d04dcb73d
2020-02-07Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3 am: 3f23491f86Automerger Merge Worker
Change-Id: I1ee2c41d03965fd8dd5da95d7c8044253822fa92
2020-02-07Merge "CMakeLists for Cross-compiling" am: fcd1d5e3e3Automerger Merge Worker
Change-Id: Ida0be3b8b45eb8fc204490b393abb8002433f783
2020-02-07Merge "CMakeLists for Cross-compiling"Treehugger Robot
2020-02-05CMakeLists for Cross-compilingHao Chen
Bug: b/148877100 Test: verified successful cross compilation Change-Id: Ife96babf276f47aed46efdd330777552c444e5eb
2020-01-24[automerger skipped] Merge "libprotobuf-cpp-lite is removed from VNDK." am: ↵Automerger Merge Worker
7a345e6d56 am: b8fdd31ba2 -s ours am skip reason: Change-Id Iec1ab12d0f1d1a99d0c9ceddac1e285ece7a248d with SHA-1 4d7991c2bf is in history Change-Id: I68071fc22be7a978aed8a51a1a3f3be827e998e8
2020-01-24Merge "libprotobuf-cpp-lite is removed from VNDK." am: 7a345e6d56Automerger Merge Worker
Change-Id: I439247ee25308ed886b8407afe2654465cf960fe
2020-01-24Merge "libprotobuf-cpp-lite is removed from VNDK."android-r-preview-1Jiyong Park
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 11:15:12 +0000