summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-01Snap for 8139767 from 023f88db78eafbfc4b25fa5053531b36b89d3357 to ↵androidx-startup-releaseAndroid Build Coastguard Worker
androidx-startup-release Change-Id: I16abdd9559b690631b701cf090e89f30e447843b
2021-12-21Merge "Copy remote_toolchain_inputs files when updating JDK"android-t-preview-2android-t-preview-1_r0.4android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1androidx-metrics-releaseandroid-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1android-gs-raviole-5.10-t-preview-1Colin Cross
2021-12-21Merge changes from topics "jdk-11.0.13", "jdk-11.0.3"Colin Cross
* changes: Restore *_remote_toolchain_inputs files Revert "Revert "Switch to JDK build 11.0.13+0-7937646""
2021-12-18Copy remote_toolchain_inputs files when updating JDKColin Cross
Copy the remote_toolchain_inputs files into the staging directory when updating teh JDK so they are not lost when the staging directory replaces the previous JDK. Test: update.sh 7937646 Change-Id: Idebc436f87e15f0c5b902c63ec24afe7ff6e174b
2021-12-18Restore *_remote_toolchain_inputs filesColin Cross
The JDK update removed the manually added *_remote_toolchain_inputs files, breaking remote RBE actions that use java with: prebuilts/jdk/jdk11/linux-x86/bin/java: error while loading shared libraries: libjli.so: cannot open shared object file: No such file or directory Add them back manually for now. Bug: 205944740 Test: treehugger Change-Id: Ida71a5deec4c96b08e95fd5d8eba61862c958246
2021-12-18Revert "Revert "Switch to JDK build 11.0.13+0-7937646""Colin Cross
This reverts commit 130d3e495f32d6a61d11d0fbbc7df9d77e1e0efa. Reason for revert: relanding with missing RBE remote toolchain files Change-Id: Ia466d4b4faa7eaa6fa1a7984bc0d9b9eee3fa06e
2021-12-18Merge "Revert "Switch to JDK build 11.0.13+0-7937646""Colin Cross
2021-12-18Revert "Switch to JDK build 11.0.13+0-7937646"Colin Cross
This reverts commit 558aee39629caf19ec857c4567604864eae46a87. Reason for revert: broke remote RBE actions Change-Id: Id6b5ca90eba22c0b90c34c41d5e18a44d65a27ed
2021-12-17Merge "Switch to JDK build 11.0.13+0-7937646"Treehugger Robot
2021-11-23Add JDK build 11.0.13+0-7937646 to staging am: f632d2f1fetemp_sam_210511427Colin Cross
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1899285 Change-Id: I41495fd901d4e1d0a430efd3970b0c621120963e
2021-11-22Switch to JDK build 11.0.13+0-7937646Colin Cross
Bug: 205944740 Test: treehugger Change-Id: I7ea0818aa1dfd45ec0040670044147ce76f02fbc
2021-11-22Add JDK build 11.0.13+0-7937646 to stagingandroidx-localbroadcastmanager-releaseandroidx-coordinatorlayout-releaseColin Cross
Test: none Change-Id: I8669038207e08144944cd4ddb743ae9196d0ee9b
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: 37e56d10bf -s ours am: d5847a485a -s ours am skip reason: Merged-In Ibc62ddaf9b37dc9d5c7e329f75c2c81055547627 with SHA-1 d73bdc7504 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/15567326 Change-Id: I4bed9a0a22e7adc9242f2101ad556240f0657275
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: 37e56d10bf -s ours am skip reason: Merged-In Ibc62ddaf9b37dc9d5c7e329f75c2c81055547627 with SHA-1 d73bdc7504 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/15567326 Change-Id: Ib169c081ae9c9bc8a13d70e4be3f96e66c38d57a
2021-08-14Mark sc-dev-plus-aosp-without-vendor@7634622 as mergedandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2androidx-window-releaseandroidx-resourceinspection-releaseandroidx-preference-releaseandroidx-glance-releaseandroid-s-v2-preview-1Xin Li
Merged-In: Ibc62ddaf9b37dc9d5c7e329f75c2c81055547627 Change-Id: I970255c8cb491ffc1011b5edb977dbef77ac6eac
2021-08-13Revert "Define a java_runtime and toolchain bazel targets for JDK11." am: ↵Alex Humesky
5916c1554b am: 7ed44f0a6f am: 1c6b2b3d52 Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1795130 Change-Id: I7850251024e971e36d2448fccf4a7e52d7c3a6bf
2021-08-13Revert "Define a java_runtime and toolchain bazel targets for JDK11." am: ↵Alex Humesky
5916c1554b am: 7ed44f0a6f Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1795130 Change-Id: I0c717b1c78239c3ca368c77b458eb86f09b63018
2021-08-13Revert "Define a java_runtime and toolchain bazel targets for JDK11." am: ↵Alex Humesky
5916c1554b Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1795130 Change-Id: I8428a0c5bad8c8a452def0d38a6c4e35673556ed
2021-08-13Revert "Define a java_runtime and toolchain bazel targets for JDK11."android-s-beta-5android-s-beta-5Alex Humesky
Revert "Add a java binary, a java library, and an android app ta..." Revert "Exempt prebuilts/jdk and build/bazel/examples/java BUILD..." Revert submission 1789607-java_android_ci Reason for revert: doesn't work with lunch Reverted Changes: I6f82e4984:Exempt prebuilts/jdk and build/bazel/examples/java... I75a61c24c:Define a java_runtime and toolchain bazel targets ... I0f107d334:Add a java binary, a java library, and an android ... Change-Id: Ie90d80bff367c0f62cdfb452b0bc64d92f40016b
2021-08-10Define a java_runtime and toolchain bazel targets for JDK11. am: 992225cabf ↵Romain Jobredeaux
am: 0ea3f19e14 am: d73bdc7504 Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1788471 Change-Id: I4844116d594513d8ad6cd1024c4db707056b6a8a
2021-08-10Define a java_runtime and toolchain bazel targets for JDK11. am: 992225cabf ↵Romain Jobredeaux
am: 0ea3f19e14 Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1788471 Change-Id: Ibc62ddaf9b37dc9d5c7e329f75c2c81055547627
2021-08-10Define a java_runtime and toolchain bazel targets for JDK11. am: 992225cabfRomain Jobredeaux
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1788471 Change-Id: I15b850d914d78382c1d88dc71c88eaefcb3866c5
2021-08-10Define a java_runtime and toolchain bazel targets for JDK11.Romain Jobredeaux
Test: b build build/bazel/examples/java/com/bazel:hello_java Test: b build build/bazel/examples/android_app/java/com/app Change-Id: I75a61c24ce4729fc42a3068bd55014cdab4e2512 Bug: 195786195
2021-06-22Snap for 7482086 from 2fa98b2d5f7a3f2f3251afb28d5b59272de9feb3 to ↵Android Build Coastguard Worker
androidx-startup-release Change-Id: Ifafc4f29beccf3d1b4113c7a0730bd4e4a89f1c8
2021-03-10Add libraries loaded by lint tool to java toolchain am: 11a95e7d72 am: ↵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-releaseColin Cross
2fa98b2d5f am: 03cdd5581f Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1619831 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I04b4a34b905f995e36b0879477851e0d0fd96ac9
2021-03-10Add libraries loaded by lint tool to java toolchain am: 11a95e7d72 am: ↵Colin Cross
2fa98b2d5f Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1619831 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If322f7900306445f7665716524a6e39b6a8e8a20
2021-03-10Add libraries loaded by lint tool to java toolchain am: 11a95e7d72android-s-beta-4android-s-beta-3androidx-wear-wear-ongoing-releaseandroid-s-beta-4Colin Cross
Original change: https://android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/1619831 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2885261c0b4978c28070c8f227862c68ff44f493
2021-03-04Add libraries loaded by lint tool to java toolchainandroid-s-beta-2android-s-beta-1androidx-leanback-releaseColin Cross
The lint tool uses parts of the JRE that load more native libraries. Add them to java_remote_toolchain_inputs so they are made available to RBE actions. Bug: 181681346 Test: m USE_RBE=true RBE_LINT=true lint-check Change-Id: I029a1ea7782dc5508167e4318a60247ea136e2ff
2020-09-13[automerger skipped] Add remote toolchain inputs for java and javac. am: ↵Automerger Merge Worker
c796f24444 am: 94af86b85c -s ours am skip reason: Change-Id I2dbd654d792bac1ca63471a172eb2534d505f595 with SHA-1 c796f24444 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/jdk/jdk11/+/11491641 Change-Id: If7e3d5798c6faeafbad9a08084be204b2850f9de
2020-05-27Switch to JDK build 11.0.4+0-6508549 am: 4b776e23b6 am: e4fb089b45 am: ↵Jeff Gaston
671f6a7cab am: bb0bb16913 am: aac7c9dfe3 Change-Id: Ide204fe9485454599bd13bba3258edfc9de46364
2020-05-27Add JDK build 11.0.4+0-6508549 to staging am: 8ceae549ec am: 3708d520f1 am: ↵Jeff Gaston
97041ec0aa am: bbbbbc202e am: 9965897c7b Change-Id: I2179777dc8521b03d04573f890e7b1a1d1db21cc
2020-05-27Switch to JDK build 11.0.4+0-6508549 am: 4b776e23b6 am: e4fb089b45 am: ↵android-s-preview-1Jeff Gaston
671f6a7cab am: bb0bb16913 Change-Id: I45cc82a35ff2cef375069054d763213c99189070
2020-05-27Add JDK build 11.0.4+0-6508549 to staging am: 8ceae549ec am: 3708d520f1 am: ↵Jeff Gaston
97041ec0aa am: bbbbbc202e Change-Id: I1f73a874110f46a7d032b2ac30cb1efcfd9ba632
2020-05-27Switch to JDK build 11.0.4+0-6508549 am: 4b776e23b6 am: e4fb089b45 am: ↵androidx-transition-releaseandroidx-print-releaseandroidx-enterprise-releaseandroidx-biometric-releaseandroidx-autofill-releaseJeff Gaston
671f6a7cab Change-Id: Icff6d8b289668abe4ea6ed05fcb36e154c71f52d
2020-05-27Add JDK build 11.0.4+0-6508549 to staging am: 8ceae549ec am: 3708d520f1 am: ↵Jeff Gaston
97041ec0aa Change-Id: I1f21757a3f55081f52abd9fd61f89704b29f295e
2020-05-27Switch to JDK build 11.0.4+0-6508549 am: 4b776e23b6 am: e4fb089b45Jeff Gaston
Change-Id: Iffc1d62d2002a3990979059fa8da1e4288c35d0a
2020-05-27Add JDK build 11.0.4+0-6508549 to staging am: 8ceae549ec am: 3708d520f1Jeff Gaston
Change-Id: Ib1f659b9bf0748f01283f2be778f2b636f42a8e1
2020-05-27Switch to JDK build 11.0.4+0-6508549 am: 4b776e23b6android-r-beta-3android-r-beta-2androidx-media2-media2-widget-releaseandroidx-exifinterface-releaseandroidx-concurrent-releaseJeff Gaston
Change-Id: If3850960fb194bc2efeab9ff36708f87aebe365b
2020-05-27Add JDK build 11.0.4+0-6508549 to staging am: 8ceae549ecJeff Gaston
Change-Id: Ic15b81b98ace5a3c4ec5c8e830c58a0b872cc6bf
2020-05-26Some usability adjustments in update.sh am: bbeda2d62c am: 9783fe0e24 am: ↵Jeff Gaston
6df1471480 am: ca091ca733 am: 03dffd7416 Change-Id: Ia198ab0bbdd5e3db9510508777101b5e61c6be19
2020-05-26Checking in script to import new version from build server am: 4731db3c0c ↵Jeff Gaston
am: 93881213e6 am: df9b6268f9 am: 6744807be9 am: 2c68040743 Change-Id: I629f303e5842ddfbfcb19279082758fab17e3b26
2020-05-26Some usability adjustments in update.sh am: bbeda2d62c am: 9783fe0e24 am: ↵Jeff Gaston
6df1471480 am: ca091ca733 Change-Id: I8b56441ab18c8bb3115a5e453f0279d40f10c961
2020-05-26Checking in script to import new version from build server am: 4731db3c0c ↵Jeff Gaston
am: 93881213e6 am: df9b6268f9 am: 6744807be9 Change-Id: I652a9556c3687f3638fe822ac77eeb717543da75
2020-05-26Some usability adjustments in update.sh am: bbeda2d62c am: 9783fe0e24 am: ↵Jeff Gaston
6df1471480 Change-Id: If129287fbae5d8162c2981c4cabe1a6ecc5398e6
2020-05-26Checking in script to import new version from build server am: 4731db3c0c ↵Jeff Gaston
am: 93881213e6 am: df9b6268f9 Change-Id: I4b2452213eb9a325c81477a131ce5670848ff4ef
2020-05-26Switch to JDK build 11.0.4+0-6508549Jeff Gaston
Bug: 155906507 Test: built aosp crosshatch userdebug with RBE enabled Change-Id: Id84ac79ca51849d9d667ca27ce5bf63f5089c1d6
2020-05-26Some usability adjustments in update.sh am: bbeda2d62c am: 9783fe0e24Jeff Gaston
Change-Id: I11ef70bfbd63ad6f203bbe4fc0c3db0e5aa6a537
2020-05-26Checking in script to import new version from build server am: 4731db3c0c ↵Jeff Gaston
am: 93881213e6 Change-Id: Ie6ee918e9909f46aac1e540b2efdff6448a316af
2020-05-26Some usability adjustments in update.sh am: bbeda2d62cJeff Gaston
Change-Id: I907c4404412afb2ce27a0d3da5fe84f9db1dc671
2020-05-26Checking in script to import new version from build server am: 4731db3c0cJeff Gaston
Change-Id: Id1fc25340a7462028bd16a59f81d2c054cbc30b6