aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-07Snap for 4590521 from c67195927f579fb8a7fda44815b189e4c0ecf58f to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Ica27e523fae0752db35e92ac6479cd38d077f203
2018-02-07Merge "Build junit with core_current" am: b52b6b012d am: 697eeee7d5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devJiyong Park
am: 14abea3a56 Change-Id: I15a1c84fd41e11ac2e5b5f43907d3ad0c881007f
2018-02-06Merge "Build junit with core_current" am: b52b6b012dJiyong Park
am: 697eeee7d5 Change-Id: I04fb41ecaceb05af551bb5a2d60a2a4cf7132855
2018-02-06Merge "Build junit with core_current"Jiyong Park
am: b52b6b012d Change-Id: I25a73427aca49038a7cea1df5aae8fc8b06e67f4
2018-02-06Merge "Build junit with core_current"android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Treehugger Robot
2018-01-31Build junit with core_currentJiyong Park
Using core_current ensures that the module is not using any Android APIs (e.g. APIs under android.* packages), but only core Java APIs. Bug: 72206056 Test: m -j junit Change-Id: I7de7caf4324c088d330cadb69e03d67b8dcdc84e
2017-10-13Snap for 4393550 from 1a8355695fba3066847bf2071bd2eeace5a19b09 to pi-releaseandroid-build-team Robot
Change-Id: I7c9a3927898fd1b61ed173f31d678c3c9510e491
2017-10-12Merge "Convert external/junit to Android.bp" am: 885334531a am: 833c14eda2 ↵Colin Cross
am: d9fab9d84a am: 6f3aa13817 Change-Id: I1abea99c3510b9cd11567b59591c0f15444f425d
2017-10-11Merge "Convert external/junit to Android.bp" am: 885334531a am: 833c14eda2android-wear-8.0.0_r1Colin Cross
am: d9fab9d84a Change-Id: I76080f28197eedf2be2f8591913ea73a0dfa1fd7
2017-10-11Merge "Convert external/junit to Android.bp" am: 885334531aColin Cross
am: 833c14eda2 Change-Id: Id32deefaeb30c835c09c788912597f0ee43461cc
2017-10-11Merge "Convert external/junit to Android.bp"android-o-mr1-iot-preview-6o-mr1-iot-preview-6Colin Cross
am: 885334531a Change-Id: Ia34bb6364ad04f69ee9efa1c28c2b55bcfbddaf5
2017-10-11Merge "Convert external/junit to Android.bp"Colin Cross
2017-10-09Convert external/junit to Android.bpColin Cross
See build/soong/README.md for more information. Test: m -j checkbuild Change-Id: Iccb21a6735b67301c96a9fc1f92face76f499244
2017-04-18Merge "add OWNERS to junit" am: 2faf8f4ae9 am: 95c268744d am: f7d7d87640android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr1-devChih-hung Hsieh
am: 18fb512509 Change-Id: I979781e79de137d69c63120dc285e9e826a4c423
2017-04-18Merge "add OWNERS to junit" am: 2faf8f4ae9 am: 95c268744dandroid-o-mr1-preview-2android-o-mr1-preview-1Chih-hung Hsieh
am: f7d7d87640 Change-Id: Ie03d62656d834397807ee8edcfa8e30a5d0a2f81
2017-04-18Merge "add OWNERS to junit" am: 2faf8f4ae9Chih-hung Hsieh
am: 95c268744d Change-Id: Ib3338ce400ba023b64af2f3c10d9688ac2eaa6f4
2017-04-18Merge "add OWNERS to junit"Chih-hung Hsieh
am: 2faf8f4ae9 Change-Id: I7248cd136daccf6e8c91edc66a6641f099d2dcc2
2017-04-18Merge "add OWNERS to junit"android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4Chih-hung Hsieh
2017-04-17add OWNERS to junitChih-Hung Hsieh
Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I6d5ed2c9c76025cdfd9757dbeb5eb2c5c8887567
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0' am: a565149246 am: a4abf50c68android-vts-8.0_r2android-vts-8.0_r1oreo-devPaul Duffin
am: ec7ba37c41 Change-Id: Id050d56e8f8442f413f17bb89314ade516a800ac
2017-02-24Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1" am: ↵Paul Duffin
facdecc8e0 am: 44deb443eb am: d4c13f2812 Change-Id: I90e00572b11dfff5ad6f59819d9cf6b65f62a3cb
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0' am: a565149246Paul Duffin
am: a4abf50c68 Change-Id: If9cdccb1d27c91084021e481b998fddb860a84c2
2017-02-24Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1" am: ↵Paul Duffin
facdecc8e0 am: 44deb443eb Change-Id: Ieb0bfc27f5e64d89a0ddb37abf15579c1a0e0697
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0'Paul Duffin
am: a565149246 Change-Id: I07fbfb874b63dda6e1c2ebf19c75cff709059779
2017-02-24Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1"Paul Duffin
am: facdecc8e0 Change-Id: I66362f845bb8f67fa8bbd570a4cd06984e4053f1
2017-02-24Merge changes from topic 'upgrade-hamcrest-to-2.0'android-o-preview-1android-n-mr2-preview-2o-previewPaul Duffin
* changes: Allow JUnit to compile against external/hamcrest v2.0 Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1"
2017-01-25Allow JUnit to compile against external/hamcrest v2.0Paul Duffin
Bug: 30946317 Test: make checkbuild Change-Id: Idbeddca3346d43ed39cdbb0c6e44779b54f981a4
2017-01-23Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1"Paul Duffin
This reverts commit 86f323b2a73c9c250fbe25b828435aa936704ab3. Bug: 30946317 Test: make checkbuild Change-Id: Ie72fec656d01f24a1724d33a35ceecdb57aaba57
2017-01-20Clean junit4-target filesColin Cross
Incremental builders were failing to detect a real build breakage, but treehugger was seeing it and failing all changes in presubmit. Clean the stale files so it doesn't happen again. Bug: 34528444 Test: cleans Change-Id: I0320bad5f5f9292e88d03be3e29606833d18cb55
2017-01-21Merge "Remove junit4-target" am: 7323bf635e am: 3151d40422 am: e3b284d3c4Paul Duffin
am: bbbc818f31 Change-Id: I1b5b2827af9ed06fa46d9163dfe6c969e6442e78
2017-01-21Merge "Remove junit4-target" am: 7323bf635e am: 3151d40422Paul Duffin
am: e3b284d3c4 Change-Id: Iaf02f33a44a3b52bb7917d0a1ced162f1e0b14d4
2017-01-21Merge "Remove junit4-target" am: 7323bf635ePaul Duffin
am: 3151d40422 Change-Id: Ie9f6fb21c5b4c1d6b09a28fd51617185b739fda7
2017-01-21Merge "Remove junit4-target"Paul Duffin
am: 7323bf635e Change-Id: Ia7b468a059ccc0a2d2061587383ca0006bfec4d7
2017-01-21Merge "Remove junit4-target"Treehugger Robot
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am: ↵Colin Cross
9dd4dbb077 am: 2933ae2128 am: c1600bcfba am: 83b9cd9336 Change-Id: I70e474d9a96a7ac0a8d0d7e221b60c003414d624
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am: ↵Colin Cross
9dd4dbb077 am: 2933ae2128 am: c1600bcfba Change-Id: Ib54435dcc6a415f2e4e8438b4e4fe8365cf66361
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am: ↵Colin Cross
9dd4dbb077 am: 2933ae2128 Change-Id: I6469d292950d2439f71e0d9128b7591f5b5b7151
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex"Colin Cross
am: 9dd4dbb077 Change-Id: I132c36e93f195769b1cd5630ddc62da1d1b20219
2017-01-20Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex"Colin Cross
2017-01-20Remove junit4-targetPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: I7804006b0b35a7115dcf5c68f586dea99fb770dc
2017-01-19Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdexColin Cross
BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY must be used for libraries that will be linked with LOCAL_STATIC_JAVA_LIBRARIES. Test: m -j java Change-Id: I95fb96b8c9c09ee07293c23ea74bde950ee35dd5
2017-01-10Merge changes from topic 'upgrade-junit4.12' am: 7cfdf040fd am: 535e14398f ↵Paul Duffin
am: 5711c1a80f am: 72def511bb Change-Id: Ic87c944c639840109d67777e34ec7a921993671c
2017-01-10Extra generic type information to aid certain javacs. am: a0b1fd6752 am: ↵Ian Rogers
472f7143b4 am: bc00960c0f am: 08c646823c Change-Id: I64a7f15d74297f9fd4d94e27c69be0acb79f1782
2017-01-10Revert matchers back to 4.10 to compile against Hamcrest 1.1 am: 86f323b2a7 ↵Paul Duffin
am: e20af47911 am: 0453c6d681 am: cd58d3905f Change-Id: If4f2d597c011c400fb27a826c3c186f7d14ed5b5
2017-01-10Remove support for stuck threads am: 4156f43b51 am: b00f6c540d am: 47d047cb9aPaul Duffin
am: 72f680fa68 Change-Id: I121eaea6a56d5823d1899490d471db2807420629
2017-01-10Remove DisableOnDebug (new in 4.12) as it is not supported on Android am: ↵Paul Duffin
c8055484aa am: 25b39d4c9a am: 8459641eac am: b5af667c23 Change-Id: I086fa15d10ecd3e499861d3a8f8cea42509ca633
2017-01-10Upgrade to JUnit 4.12 am: aeb93fc33c am: 25a6c4cb46 am: 43201a730cPaul Duffin
am: 418644b561 Change-Id: I64c502138519e5d11a434057835864a19aa51c57
2017-01-10Merge changes from topic 'upgrade-junit4.12' am: 7cfdf040fd am: 535e14398fPaul Duffin
am: 5711c1a80f Change-Id: I7fc6019deadb6251db8243cf2862d39701054120
2017-01-10Extra generic type information to aid certain javacs. am: a0b1fd6752 am: ↵Ian Rogers
472f7143b4 am: bc00960c0f Change-Id: Ic382f2e0bae783532c2dc95672a545d5add7059f
2017-01-10Revert matchers back to 4.10 to compile against Hamcrest 1.1 am: 86f323b2a7 ↵Paul Duffin
am: e20af47911 am: 0453c6d681 Change-Id: I513c274dc6ce48cd6b02679d37461efac7131688
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 15:29:33 +0000