aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge Android R"HEADmasterXin Li2020-09-101-0/+3
|\
| * Merge Android RXin Li2020-09-081-0/+3
|/| | | | | | | | | | | Bug: 168057903 Merged-In: Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1 Change-Id: I2c5467ae16e6293c0186489239e743e6a5c3a079
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-271-0/+3
|/| | | | | | | | | | | Bug: 166295507 Merged-In: Ie49f7039a3c1e5c953688a4c9d6534af6bc45f20 Change-Id: Iebb48e22370dcc4eaeb0c76aa0a8b1b704de36a1
| * [automerger skipped] Make libprotobuf-cpp-full buildable for native_bridge ↵Victor Khimenko2020-07-140-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1ff51e3198 -s ours am skip reason: Change-Id Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 with SHA-1 f804e546ba is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/12128190 Change-Id: Ie49f7039a3c1e5c953688a4c9d6534af6bc45f20
| | * Make libprotobuf-cpp-full buildable for native_bridgeandroid11-devVictor Khimenko2020-07-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/153609531 Test: m libprotobuf-cpp-full.native_bridge Change-Id: Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4 Merged-In: Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4
| * | Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fd ↵Victor Khimenko2020-07-031-0/+2
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | am: f4089a6108 Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1354625 Change-Id: I282493aaa7d4f9eaa89dca11250420bf9eae9d27
* | | Merge "Make libprotobuf-cpp-full buildable for native_bridge" am: 61802769fdVictor Khimenko2020-07-031-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/1354625 Change-Id: I0d00d525f1e94fefaf4ad7158089b1be42c004b9
| * | | Merge "Make libprotobuf-cpp-full buildable for native_bridge"android-r-beta-3android-r-beta-2Victor Khimenko2020-07-031-0/+2
|/| | |
| * | | Make libprotobuf-cpp-full buildable for native_bridgeVictor Khimenko2020-07-021-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | Bug: http://b/153609531 Test: m libprotobuf-cpp-full.native_bridge Change-Id: Ia1f88a6ab66df2316d1db757c3e0ba024f7afed4
| * | Set apex_available for libprotobuf-java-lite. am: 577f4f4c79waynema2020-06-181-0/+1
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/protobuf/+/11882004 Change-Id: If0c316576f5c8b727f05158d32227837b9810f2b
| | * Set apex_available for libprotobuf-java-lite.waynema2020-06-171-0/+1
| | | | | | | | | | | | | | | | | | | | | Bug: 153942334 Test: make Change-Id: I7b618a3f946493d227cc6a9915a6965ec5ed4688
| * | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-04-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | 4954d069eb -s ours am skip reason: Change-Id I5bf9ceb712691916a90afcae92056d0b5875f78c with SHA-1 28ca39bf52 is in history Change-Id: Ie91431a09e213ac1497eae2926600c2783fe6861
| | * Set min_sdk_version to be part of mainline modulesJooyung Han2020-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Merged-In: I5bf9ceb712691916a90afcae92056d0b5875f78c Change-Id: I5bf9ceb712691916a90afcae92056d0b5875f78c (cherry picked from commit 28ca39bf520007aacca6c1ee26b87b165479f156)
| * | Merge "Set min_sdk_version to be part of mainline modules" am: 8ccc54a794 ↵Jooyung Han2020-04-251-0/+1
| |\ \ | |/ / |/| | | | | | | | | | | am: f66b5da2d8 Change-Id: I3c242e8e1dc07339763fa20e495e5bb37bd62976
* | | Merge "Set min_sdk_version to be part of mainline modules" am: 8ccc54a794androidx-work-releaseandroidx-webkit-releaseandroidx-sqlite-releaseandroidx-sqlite-inspection-releaseandroidx-navigation-releaseandroidx-concurrent-releaseJooyung Han2020-04-251-0/+1
|\ \ \ | | | | | | | | | | | | Change-Id: I3fc1ad7c8b295d5024a9e69e2781f54e89842de0
| * \ \ Merge "Set min_sdk_version to be part of mainline modules"androidx-wear-releaseandroidx-appcompat-releaseJooyung Han2020-04-251-0/+1
| |\ \ \
| | * | | Set min_sdk_version to be part of mainline modulesJooyung Han2020-04-161-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | [automerger skipped] make libprotobuf-java-lite available to ↵Jiyong Park2020-04-210-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | com.android.wifi APEX am: 0ae4632834 -s ours am skip reason: Change-Id Ia2ea30bef7279113eec5b35f6cec676254a636af with SHA-1 960ebb0fec is in history Change-Id: I41f0a4adc3fd40c0daa22ab78ffa5f3612e9f454
| | | * make libprotobuf-java-lite available to com.android.wifi APEXJiyong Park2020-04-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The APEX uses the protobuf lib via wifi-lite-protos and wifi-service-pre-jarjar. Exempt-From-Owner-Approval: cherry-pick Bug: 150999716 Test: m Merged-In: Ia2ea30bef7279113eec5b35f6cec676254a636af (cherry picked from commit faf03fd14145184c6979154b9eab486097ff9eb7) Change-Id: Ia2ea30bef7279113eec5b35f6cec676254a636af
| | * | [automerger skipped] Set apex_available property am: d1acb170e3 -s oursJiyong Park2020-04-210-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id I20a6ef3e3a95c5ebce63666e7b88623997623083 with SHA-1 4c1ea7f7f5 is in history Change-Id: I20419e109f19c8e39a70160acce4264781251000
| | | * Set apex_available propertyJiyong Park2020-04-201-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: cherry-pick Bug: 150999716 Test: m Merged-In: I20a6ef3e3a95c5ebce63666e7b88623997623083 (cherry picked from commit dd6f59aad67e08ade1436125acd7008e2c75404b) Change-Id: I20a6ef3e3a95c5ebce63666e7b88623997623083
| | * | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| | |\ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: b286f60380 -s ours am skip reason: subject contains skip directive Change-Id: I4e6f51e5ac2b9f072f01bde77af039a90e852543
* | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I18a142d2452a040acfe871e3fd78dc76f13bf8fd
| * \ \ \ Merge "Move most protoc sources to libprotoc" am: df8e697966 am: 9a004f6509Treehugger Robot2020-03-301-75/+37
| |\ \ \ \ | |/ / / / |/| | | | | | | | | Change-Id: I7c41b2cf3572abe673f62027f7a30ea4bf517858
| * | | | Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06 am: 71dbd4fd4eTreehugger Robot2020-03-281-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I78aa78a8bed8784415b708ac815980f3cf2b6888
| * \ \ \ \ Merge "Set apex_available property" am: 6645f5c5d0 am: cd3ff8ace1Jiyong Park2020-03-231-2/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I6523b685a6de26898248a62e7a67099525ab1f88
| * \ \ \ \ \ Merge "Fix comment in protobuf METADATA" am: 575bb1eeeb am: e3b9a2ce3dHaibo Huang2020-03-211-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I718d99d15f827ac762ec667f1c0cd7e833ea37cf
| * \ \ \ \ \ \ DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li2020-03-190-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 8e765c7b3e Change-Id: I46ba06b606680b15beae4a731a1d836f2b1f1a9a
| | | | | | | * | make libprotobuf-java-lite available to com.android.wifi APEXJiyong Park2020-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The APEX uses the protobuf lib via wifi-lite-protos and wifi-service-pre-jarjar. Exempt-From-Owner-Approval: cherry-pick from master Bug: 150999716 Test: m Merged-In: Ia2ea30bef7279113eec5b35f6cec676254a636af (cherry picked from commit faf03fd14145184c6979154b9eab486097ff9eb7) Change-Id: Ia2ea30bef7279113eec5b35f6cec676254a636af
| | | | | | | * | Merge "Move most protoc sources to libprotoc" am: df8e697966 am: 9a004f6509Treehugger Robot2020-03-301-75/+37
| | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | Change-Id: Idea8faf32147eee0dbbaefd6fe3ffbd07c906b6c
* | | | | | | | | Merge "Move most protoc sources to libprotoc" am: df8e697966Treehugger Robot2020-03-301-75/+37
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | Change-Id: I1610ca52ae83ead44861dcfdc4ddf919362294fb
| * | | | | | | Merge "Move most protoc sources to libprotoc"androidx-swiperefreshlayout-releaseandroidx-slidingpanelayout-releaseandroidx-emoji-releaseandroidx-drawerlayout-releaseandroidx-customview-releaseandroidx-core-releaseTreehugger Robot2020-03-301-75/+37
| |\ \ \ \ \ \ \
| | * | | | | | | Move most protoc sources to libprotocColin Cross2020-03-271-75/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | * | Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06 am: 71dbd4fd4eTreehugger Robot2020-03-281-1/+0
| | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | Change-Id: Ie8e0cb776c948b7a764a8d9cddb7116c17a88f86
* | | | | | | | | Merge "Remove redundant NOTICE symbolic link." am: 9f9e597a06Treehugger Robot2020-03-281-1/+0
|\| | | | | | | | | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | Change-Id: Icd01590c6ab4049a9c6759e481a6e374aeca2f40
| * | | | | | | Merge "Remove redundant NOTICE symbolic link."Treehugger Robot2020-03-281-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove redundant NOTICE symbolic link.Bob Badour2020-03-251-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | [automerger skipped] Merge "Set apex_available property" am: 6645f5c5d0 am: ↵Jiyong Park2020-03-230-0/+0
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd3ff8ace1 -s ours am skip reason: Change-Id I20a6ef3e3a95c5ebce63666e7b88623997623083 with SHA-1 4c1ea7f7f5 is in history Change-Id: I85c31b3560653541ae494bab3bb49d9725328366
* | | | | | | Merge "Set apex_available property" am: 6645f5c5d0Jiyong Park2020-03-231-2/+19
|\| | | | | | | |_|_|/ / / |/| | | | | | | | | | | Change-Id: Id34e1dd069b56aa1bf093e18eded8a586d383602
| * | | | | Merge "Set apex_available property"Jiyong Park2020-03-231-2/+19
| |\ \ \ \ \
| | * | | | | Set apex_available propertyJiyong Park2020-03-231-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | Set apex_available propertyJiyong Park2020-03-231-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | Merge "Fix comment in protobuf METADATA" am: 575bb1eeeb am: e3b9a2ce3dHaibo Huang2020-03-211-1/+1
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | Change-Id: Ic89402d948f97eca3147d3f5944677558c3f2422
* | | | | | | Merge "Fix comment in protobuf METADATA" am: 575bb1eeebHaibo Huang2020-03-211-1/+1
|\| | | | | | | |_|_|/ / / |/| | | | | | | | | | | Change-Id: I6fc329c908e4fa0a5a46cd23cb89040b785bd807
| * | | | | Merge "Fix comment in protobuf METADATA"Haibo Huang2020-03-211-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix comment in protobuf METADATAHaibo Huang2020-03-211-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Exempt-From-Owner-Approval: No code change. Change-Id: I7555603832218534555b2bfb709eff1a698a97cc
| | | * | [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
| | | |\ \ | |_|_|/ / |/| | | / | | | |/ | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 8e765c7b3e -s ours am skip reason: subject contains skip directive Change-Id: I887b2e5a669476eb000dcd9faeb68938c7b8d4cd
* | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Bug: 151763422 Change-Id: I17ffcdefdb309d9da31e8df55bc080f374d46b65
| | * Allow protobufutils to be linked from apexJeffrey Huang2020-02-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This cannot be done in aosp because statsd apex doesn't exist there. Bug: 145923087 Test: m -j Change-Id: I8c0f21ca63503663826c891c34be67f08759fc05
| | * Merge "Set apex_available for libprotobuf-cpp-lite." am: 7428910307 am: ↵Automerger Merge Worker2020-02-111-0/+5
| | |\ | | |/ | |/| | | | | | | | | | 247616f215 am: 26d6ef2d57 Change-Id: I86868511566e9c296f3cebe19b5064a29c1039ed
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-02 21:19:38 +0000