summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-20Merge "Enable windows target" into mainHEADmastermainMatt Gilbride
2024-03-18Enable windows targetMatt Gilbride
`//tools/apksig` build targets will soon depend on this, and windows must be enabled (transitively) on all dependencies. Bug: 319296492 Test: TH Change-Id: Id4280cb4ccf371ebae114135d6f2e38a2b823071
2024-01-03Merge "Update `OWNERS` files under `external/jsr305`." into main am: ↵Roland Levillain
2830eecd17 am: c618c1dd64 am: f58763cb01 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2894201 Change-Id: I4ddfa2c19dff572ddeab5c5e4b06d01742cfc16d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Update `OWNERS` files under `external/jsr305`." into main am: ↵Roland Levillain
2830eecd17 am: c618c1dd64 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2894201 Change-Id: I13855c25244615cae32ef2dc2d19ae66b6d0c960 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Update `OWNERS` files under `external/jsr305`." into main am: 2830eecd17Roland Levillain
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2894201 Change-Id: If9d0cdeff8a53835c2bdbdedfb2b30baae01011f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03Merge "Update `OWNERS` files under `external/jsr305`." into mainRoland Levillain
2024-01-03Update `OWNERS` files under `external/jsr305`.Roland Levillain
Test: n/a Change-Id: If97d803bf966d232832095d6705c9ea1639a579d
2023-02-14Merge "Delete manual jsr305 BUILD file." am: b917540b3d am: 11e0f16dec am: ↵android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devRomain Jobredeaux
ed23b160f5 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2420223 Change-Id: Ic56ce5da5d6e7abce4f153cb0c2d6e93a3c5a42a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Merge "Delete manual jsr305 BUILD file." am: b917540b3d am: 11e0f16decRomain Jobredeaux
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2420223 Change-Id: I88affc38c622608417baa33c2f090707927cab11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Merge "Delete manual jsr305 BUILD file." am: b917540b3dandroid-u-beta-1-gplRomain Jobredeaux
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2420223 Change-Id: I2b24930502412a9e87a8efc64a97136350e0920a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Merge "Delete manual jsr305 BUILD file."Romain Jobredeaux
2023-02-09Merge "Pin tradefed dependencies to Java 11" am: c9f2168694 am: 13a64e1c39 ↵Sorin Basca
am: 19b0823fa6 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2419110 Change-Id: I4be3da6bf7c9af2a27795403de69dd477354733e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Pin tradefed dependencies to Java 11" am: c9f2168694 am: 13a64e1c39Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2419110 Change-Id: I6a6bcfac9903c0d6f8593a6a6b089e4492afb5a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Pin tradefed dependencies to Java 11" am: c9f2168694Sorin Basca
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2419110 Change-Id: Ic3f1c28a2c9d940be2bcef62b2eafcf28fd388ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Merge "Pin tradefed dependencies to Java 11"Sorin Basca
2023-02-04Pin tradefed dependencies to Java 11Sorin Basca
Bug: 267831518 Test: TH Change-Id: I9df9cd836d42d67f1fd86f191509187c3642621d
2023-02-03Delete manual jsr305 BUILD file.Romain Jobredeaux
We only use the host library and it can be auto-converted by b2pbuild. Change-Id: I5f3bd21922493713f9cab080a9af069b92675e1d
2022-11-30Merge "Bp2Build for libs property in java_library" am: 4c592bc61f am: ↵Alix Espino
d7b0094f27 am: 8d99a89b85 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2321340 Change-Id: I6353cc3b22d6ae6bc6715edd4475c43f3558b6ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Merge "Bp2Build for libs property in java_library" am: 4c592bc61f am: d7b0094f27Alix Espino
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2321340 Change-Id: I3e19863bfb3a2b055d68fea1e903790890cb3e52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Merge "Bp2Build for libs property in java_library" am: 4c592bc61fmain-16k-with-phonesAlix Espino
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2321340 Change-Id: Ida64dedc1f0b634469b15eb1378ff360af42f3e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30Merge "Bp2Build for libs property in java_library"Alix Espino
2022-11-29Bp2Build for libs property in java_libraryAlix
Added jsr305-neverlink module to the hardcoded Build file for jsr305 Bug: 244210934 Test: built module auto-common which has jsr305 as a libs dep Change-Id: Ic20cee8a98738d0db1f3f76f62982ed9f88e9298
2021-11-11[automerger skipped] Make jsr305 anyapex-available am: 5611cd4d8b -s ourst_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Santiago Seifert
am skip reason: Merged-In I6555b390681c9b78bbcd80c893a76d4b34c01013 with SHA-1 0151bf2c1b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr305/+/16221181 Change-Id: I6d33a8261dde8a13e07613f0b9dd1652219c16b4
2021-11-11Make jsr305 anyapex-availableSantiago Seifert
Already merged to master with aosp/1849422 Bug: 199522401 Test: Build. Change-Id: Idb053d5c31d0da96ee6a38584abac8393bc341c5 Merged-In: I6555b390681c9b78bbcd80c893a76d4b34c01013
2021-10-07Merge "Make jsr305 anyapex-available" am: 1b3024b1ed am: 7c7b5501dc am: ↵Treehugger Robot
8cc48d11d5 am: eadf1f98a9 am: d1cf8cf3e9 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1849422 Change-Id: Ibd681c8c13cfdaddd9bbafcd9e40ad64779d92eb
2021-10-07Merge "Make jsr305 anyapex-available" am: 1b3024b1ed am: 7c7b5501dc am: ↵Treehugger Robot
8cc48d11d5 am: eadf1f98a9 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1849422 Change-Id: Idabfd460e2c73b8b7f5b1c5c1fb7da12c0fb764b
2021-10-07Merge "Make jsr305 anyapex-available" am: 1b3024b1ed am: 7c7b5501dc am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
8cc48d11d5 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1849422 Change-Id: I704a6eeafb98681ef980a5a982b535cf7e51fe94
2021-10-07Merge "Make jsr305 anyapex-available" am: 1b3024b1ed am: 7c7b5501dcTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1849422 Change-Id: I5336f58689a40fc614ca8a75fe632cc60eeb8380
2021-10-07Merge "Make jsr305 anyapex-available" am: 1b3024b1edTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1849422 Change-Id: I3b88a075930fbdb1eb83e1aa41eb314f127a57b9
2021-10-07Merge "Make jsr305 anyapex-available"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
2021-10-07Make jsr305 anyapex-availableSantiago Seifert
Bug: 199522401 Change-Id: I6555b390681c9b78bbcd80c893a76d4b34c01013 Test: Manually using ag/16005921.
2021-09-22Merge "Add a Bazel BUILD file for jsr305." am: 18a9d6d23f am: 389ecf5861 am: ↵Romain Jobredeaux
837937771d am: ffb8e2ebf6 am: 6c0d63e865 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1822112 Change-Id: I54346343be841997955ddfd61614594eb2fb2e0b
2021-09-22Merge "Add a Bazel BUILD file for jsr305." am: 18a9d6d23f am: 389ecf5861 am: ↵Romain Jobredeaux
837937771d am: ffb8e2ebf6 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1822112 Change-Id: Ie47640a0b9d36113e2f995540bb7e061e1822205
2021-09-22Merge "Add a Bazel BUILD file for jsr305." am: 18a9d6d23f am: 389ecf5861 am: ↵Romain Jobredeaux
837937771d Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1822112 Change-Id: If84cd44a4ee2da1cb4347b01dae4fe14ab1a33c0
2021-09-22Merge "Add a Bazel BUILD file for jsr305." am: 18a9d6d23f am: 389ecf5861Romain Jobredeaux
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1822112 Change-Id: I5e1ef5cb20654e46a0c1f4dcfb53228e1511baf1
2021-09-22Merge "Add a Bazel BUILD file for jsr305." am: 18a9d6d23fRomain Jobredeaux
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1822112 Change-Id: I33bb2e75df5f8e2706bfadbcb02cc99034074840
2021-09-22Merge "Add a Bazel BUILD file for jsr305."Romain Jobredeaux
2021-09-16Add a Bazel BUILD file for jsr305.Romain Jobredeaux
Test: b build external/jsr305/... Change-Id: I49465ddc5c4bf537bf5013790e272ef391d12777 Bug: 199299428
2021-06-25Merge "Update OWNERS file" am: 1c47bdb556 am: 16a41add5b am: e0c409648a am: ↵Orion Hodson
383c34bc72 Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1739059 Change-Id: I87b0c95088d4dd581cfe88c88aebab6082e392ce
2021-06-25Merge "Update OWNERS file" am: 1c47bdb556 am: 16a41add5b am: e0c409648aOrion Hodson
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1739059 Change-Id: I60a27d8d264cc341e6cd7ba8550f337986db0bb1
2021-06-25Merge "Update OWNERS file" am: 1c47bdb556 am: 16a41add5bOrion Hodson
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1739059 Change-Id: I89ab8ef211d83daea19ded9429dd2754507aa366
2021-06-25Merge "Update OWNERS file" am: 1c47bdb556Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/1739059 Change-Id: I7fac5e54f4ce7e8b5c79577553c7875941a1396b
2021-06-25Merge "Update OWNERS file"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Orion Hodson
2021-06-17Update OWNERS fileOrion Hodson
Bug: none Test: treehugger Change-Id: I3d3263eb77a63aec7bd7e5841a56fd6e21dc46aa
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Id7e5f482018f7e772bb1f8198f336f0c0fffb66f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0d97043346 -s ↵android-mainline-12.0.0_r5android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19Xin Li
ours am: 5c4102760b -s ours am: fb0cfde26c -s ours am skip reason: Change-Id I3439554b22936589354c8459cfd1cf8c07adad3d with SHA-1 b2558300d9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic8160bf3b32767806b0a6dad911b16121d6317e4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0d97043346 -s ↵Xin Li
ours am: 5c4102760b -s ours am: fb0cfde26c -s ours am skip reason: Change-Id I3439554b22936589354c8459cfd1cf8c07adad3d with SHA-1 b2558300d9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I96d4a8adc861792e63153193b80e93ff54b0f330
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0d97043346 -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseXin Li
ours am: 5c4102760b -s ours am skip reason: Change-Id I3439554b22936589354c8459cfd1cf8c07adad3d with SHA-1 b2558300d9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id58b9aa4d0cf95cf50e6db331b2f84308f443dc9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 0d97043346 -s oursXin Li
am skip reason: Change-Id I3439554b22936589354c8459cfd1cf8c07adad3d with SHA-1 b2558300d9 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I75530e12d1ed140166a9d0992559a8e8ed94c6a5
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I3439554b22936589354c8459cfd1cf8c07adad3d Change-Id: I2300bd7019b4a423026e0817b0636799e23a6542
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 22:57:31 +0000