summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
9 daysSnap for 11819063 from e839be5fd478863c8c7107436fb35633089b9cf3 to sdk-releasesdk-releaseAndroid Build Coastguard Worker
Change-Id: I99540b549fb35dfebcf8a4261888b178232daf0d
10 daysMove license metadata declarations to meta-lic.mk and remove the Android.mk ↵HEADmastermainWei Li
file. Bug: 311544087 Test: CIs Change-Id: I3521dea829aa2e26072181dc00702cf471ebecf3
2024-04-30Snap for 11785460 from d8abfb0361f482a24e13dbab048e47196fe809cd to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I00e5eac20b285f60284f0bf3388583eed5de4f4d
2024-04-30Merge "Convert Android.mk to Android.bp under redfin/dumpstate" into mainTreehugger Robot
2024-03-12Snap for 11566117 from dfd63b7edc987c259725c24d32dcceaf71376896 to sdk-releaseplatform-tools-35.0.1Android Build Coastguard Worker
Change-Id: Id90c334a5fe50be55849a27b6ff9fda7c39e4501
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I41325acda1e8805b210b589f69ed2b70e047ce66 Change-Id: I191e783bd56684e501f75ad716f008b7565eb13f
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 Change-Id: I41325acda1e8805b210b589f69ed2b70e047ce66
2023-12-13Snap for 11211409 from c9084eb71119f1bdbeccce9f0b245f04aa147318 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ie42c82258c4cd9177c6cb169914d419199791545
2023-12-11[automerger skipped] Merge "Revert^2 "redfin(nfc): Modify NFC overlays for ↵Treehugger Robot
NFC apex"" into main am: c9084eb711 am: 2585699ae7 am: fb7c067a8b -s ours am skip reason: Merged-In Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 with SHA-1 0bb31c7af7 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2863087 Change-Id: I119542d91d33c227d3f0222d7ea43c3f794fae74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 81e4f48977 -s ours am: ↵Xin Li
c48cfee7e6 -s ours am: da444cad95 -s ours am skip reason: Merged-In I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0 with SHA-1 2156e0d5ed is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2865779 Change-Id: I6f5b757ed06935d14e0832be788fe8eacf807345 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into main ↵Treehugger Robot
am: c9084eb711 am: 2585699ae7 Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2863087 Change-Id: I5026b5c7e419548ab039fa1496f3ed6ce9c1a8e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into main ↵Treehugger Robot
am: c9084eb711 Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2863087 Change-Id: Iddeecbf6cb78383913f1c0b39172603e6a4f5798 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 81e4f48977 -s ours am: ↵Xin Li
c48cfee7e6 -s ours am skip reason: Merged-In I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0 with SHA-1 2156e0d5ed is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2865779 Change-Id: Ifd6221e7acb72aaefa09011efce1f0791700d525 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"" into mainTreehugger Robot
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 81e4f48977 -s oursXin Li
am skip reason: Merged-In I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0 with SHA-1 2156e0d5ed is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2865779 Change-Id: I02f10db97da428ed0a97bc9bcfec081eec4ad7fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0 Bug: 315507370 Change-Id: I217003c5b9e1a533dce770f031352a8e0e08a7d0
2023-12-06Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"Roshan Pius
3c2aa5f3a2d0f3c5642dc96c2edde201f84e8e7a Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0bb31c7af7919e0103df385fce664e04d36952a2) Merged-In: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0 Change-Id: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0
2023-12-04Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"Roshan Pius
3c2aa5f3a2d0f3c5642dc96c2edde201f84e8e7a Bug: 303286040 Test: Compiles Change-Id: Ic565eeda1ec928e59be8a3a2c406ab799ef879a0
2023-11-22Snap for 11130662 from a9544cd2ed2100127cf0f3b7c0e1127ec07bf715 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ib3569a97e3b782a7e891256018dbdd17610ea1da
2023-11-21Merge "Remove unused Android.mk under device/google/redfin am: a9544cd2ed ↵Treehugger Robot
am: 2156e0d5ed" into udc-qpr-dev-plus-aosp am: 54edddfb8d Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011 Change-Id: I9856ccf929cc516103865d61c893f5d049507e13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21Merge "Remove unused Android.mk under device/google/redfin am: a9544cd2ed ↵Treehugger Robot
am: 2156e0d5ed" into udc-qpr-dev-plus-aosp
2023-11-21Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: ↵Herbert Xue
65df820ad4 am: bf6667dd1d Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011 Change-Id: If7047a5c555305128d937a458d5c9dbb0471096f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: ↵Herbert Xue
65df820ad4 Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011 Change-Id: Ied8d486a0f2ab48acad2971f50a03f01801465fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Remove unused Android.mk under device/google/redfin am: a9544cd2ed am: ↵Herbert Xue
2156e0d5ed Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011 Change-Id: I3e2e4b292d167feb0bebfc0d99d15beeb5c9f328 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Remove unused Android.mk under device/google/redfin am: a9544cd2edHerbert Xue
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011 Change-Id: I41822151070efae7fc8988079bfc20d763639d7f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Remove unused Android.mk under device/google/redfin am: a9544cd2edtmp_amf_315507370Herbert Xue
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2836011 Change-Id: I0ac7b7a8f95e33f5cd88b4be0d9e4ec84b93a0c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17Convert Android.mk to Android.bp under redfin/dumpstateHerbert Xue
Bug: 311544087 Test: lunch aosp_redfin-trunk_staging-userdebug, m android.hardware.dumpstate@1.1-service.redfin Change-Id: I40e70657f57cda1240594d13bcef79ec0e155a33
2023-11-17Remove unused Android.mk under device/google/redfinHerbert Xue
Bug: 311544087 Test: NA Change-Id: Idb858726b083d2f91ce17f4627aadff89a942b8c
2023-11-16Merge "WLC: update AIDL manifest version to 1-2" into mainYiKai Peng
2023-11-16WLC: update AIDL manifest version to 1-2YiKai Peng
Bug: 310109332 Test: Build/Flash Change-Id: I8f3ca2f8f3ba979c466dc98fd772164767ef75df Signed-off-by: YiKai Peng <kenpeng@google.com>
2023-11-15Revert "WLC: update AIDL manifest version to 2"Thales Lima
Revert submission 25370033-wlc_aidl_v2 Reason for revert: /b/311146944 Reverted changes: /q/submissionid:25370033-wlc_aidl_v2 Change-Id: I7da8286a1327a74be942867c4f7db7e2fc3e0f87
2023-11-14WLC: update AIDL manifest version to 2YiKai Peng
Bug: 310109332 Test: Build/Flash Change-Id: Iecf289f931d1a5280d83de65779e6b5dc3763ef0 Signed-off-by: YiKai Peng <kenpeng@google.com>
2023-11-09Snap for 11073167 from f7b6db159274f8be0c2c40410d0352e9ff2771b0 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ia0bd5d7ddf652264afed370d9697c40484a9e3ac
2023-11-08[automerger skipped] Merge "Revert "redfin(nfc): Modify NFC overlays for NFC ↵Roshan Pius
apex"" into main am: f7b6db1592 am: 8a129cddad am: 666986445d -s ours am skip reason: Merged-In Icb67edebd8c0579cd015fe8a8956ae45426002ae with SHA-1 3c2aa5f3a2 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125 Change-Id: I2286c4fcdeceb94689564ce7c0b7b0b9ee487960 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08[automerger skipped] Merge "Revert "redfin(nfc): Modify NFC overlays for NFC ↵Roshan Pius
apex"" into main am: f7b6db1592 am: 7460bf3649 am: c3fe8c8e81 -s ours am skip reason: Merged-In Icb67edebd8c0579cd015fe8a8956ae45426002ae with SHA-1 3c2aa5f3a2 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125 Change-Id: Ie06ec5f1674eedd3d14108b27c390a99d47d21ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: ↵Roshan Pius
f7b6db1592 am: 8a129cddad Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125 Change-Id: If7d77a80bd985fce515e4cd2358684117b002aa8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: ↵Roshan Pius
f7b6db1592 am: 7460bf3649 Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125 Change-Id: Ice4220432f345f2034915b0842401d822534cd8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: ↵Roshan Pius
f7b6db1592 Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125 Change-Id: I22be636503e838cb89fb789349162706bd4e4d64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into main am: ↵Roshan Pius
f7b6db1592 Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2818125 Change-Id: I33d3fa29f45923dbf850fadd514d9cf0eb4d6eee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08Merge "Revert "redfin(nfc): Modify NFC overlays for NFC apex"" into mainRoshan Pius
2023-11-06Revert "redfin(nfc): Modify NFC overlays for NFC apex"Roshan Pius
Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up Merged-In: Icb67edebd8c0579cd015fe8a8956ae45426002ae Change-Id: Icb67edebd8c0579cd015fe8a8956ae45426002ae
2023-11-04Revert "redfin(nfc): Modify NFC overlays for NFC apex"Roshan Pius
Revert submission 2802548-nfc_apex Reason for revert: Causing bootloop with signed builds Reverted changes: /q/submissionid:2802548-nfc_apex Bug: 309117462 Test: Compiles, device boots up (cherry picked from https://android-review.googlesource.com/q/commit:af4a9967146824b1194f536ddb417b5f783806d7) Merged-In: Icb67edebd8c0579cd015fe8a8956ae45426002ae Change-Id: Icb67edebd8c0579cd015fe8a8956ae45426002ae
2023-10-31Snap for 11031798 from 95edaa292e665b2ddb1cfe3cec98b47ebd7f2b54 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I1f0cf90a3e299da8a194ab4a6f871493cd102eaf
2023-10-31[automerger skipped] Fix lunch choices for git_main am: 95edaa292e am: ↵Greg Kaiser
1cd429935b -s ours am: 7b6c37049a -s ours am skip reason: Merged-In I400392ba9cf7e6d35af78d6b668d52abee27497d with SHA-1 95edaa292e is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313 Change-Id: I871b40469b4011857935616b547155128c2e15ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31[automerger skipped] Fix lunch choices for git_main am: 95edaa292e am: ↵Greg Kaiser
73c75db4ed am: 877dd8bdf3 -s ours am skip reason: Merged-In I400392ba9cf7e6d35af78d6b668d52abee27497d with SHA-1 1b54ce4db1 is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313 Change-Id: I1197d6d8839360acb0ffbd0eb89ffc5cb0f42c26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30[automerger skipped] Fix lunch choices for git_main am: 95edaa292e am: ↵Greg Kaiser
1cd429935b -s ours am skip reason: Merged-In I400392ba9cf7e6d35af78d6b668d52abee27497d with SHA-1 95edaa292e is already in history Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313 Change-Id: I2589fbe9314da9cae9644ca5ec4908dc1b0d92d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Fix lunch choices for git_main am: 95edaa292e am: 73c75db4edGreg Kaiser
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313 Change-Id: I0b5319bdecd570b24a166d1752b322861c721bdb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Fix lunch choices for git_main am: 95edaa292eGreg Kaiser
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313 Change-Id: I0712aab9b00ae28e8349d38cf4d43fe9fcfeb5ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Fix lunch choices for git_main am: 95edaa292eGreg Kaiser
Original change: https://android-review.googlesource.com/c/device/google/redfin/+/2811313 Change-Id: Ib8c4ca14a2b1854895fc7543a3ddd656097a6552 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Fix lunch choices for git_mainGreg Kaiser
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1b54ce4db1a3c3ba067124a7e491ae29f8e50666) Merged-In: I400392ba9cf7e6d35af78d6b668d52abee27497d Change-Id: I400392ba9cf7e6d35af78d6b668d52abee27497d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 13:56:34 +0000