aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-13Remove junit-runner and revert files to standard JUnit 4.10Paul Duffin
Removes the junit-runner target as it is no longer used, the junit-runner-files variable and removes any Android specific patches needed to maintain backwards compatibility with the Android API. That includes the removal of TestSuiteLoader and StandardTestSuiteLoader as they are not part of JUnit 4.10 and only kept to maintain compatibility with the Android API. This will not affect the Android API as that is now generated from copies of the files in frameworks/base/test-runner/src/. Bug: 30188076 Test: make checkbuild Change-Id: I53c138cdd8b33a5b9ec1e8c16f3dde637762c0fc
2016-12-13Merge "Remove junit-targetdex as it is no longer used"Paul Duffin
2016-12-13Merge "Make junit4-target an alias for junit"Paul Duffin
2016-12-12Make junit4-target an alias for junitPaul Duffin
Part of the process of replacing junit4-target with junit so that junit4-target can be removed. Bug: 30188076 Test: make checkbuild Change-Id: Ie9061e6442124fc1a8b99aa420d7b6b263251210
2016-12-12Remove junit-targetdex as it is no longer usedPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: I921afdfaac5ad5f4c1f0930127ec415bde509337
2016-12-09Merge "Use SDK 25 to build JUnit instead of core-libart"Paul Duffin
2016-12-09Use SDK 25 to build JUnit instead of core-libartPaul Duffin
Some users of the junit target cannot build core-libart/core-oj due to limitations of their build environment. They must be using the junit4-target as that is the only JUnit target that builds against the SDK. As this is being used to replace the junit4-target it should be built in the same way. Switching to use the latest version, 25, of the SDK. Cannot use current as it has dependencies on other targets that are also not in the affected build environments. Bug: 30188076 Test: make checkbuild Change-Id: I674b8a5be800e2d4124c6db423e3261d22d3212e
2016-12-08Merge "junit doesn't need the framework."Treehugger Robot
2016-12-08junit doesn't need the framework.Nicolas Geoffray
So it needs to be LOCAL_NO_STANDARD_LIBRARIES=true. Test: builds fine with master-art manifest. Change-Id: I0196342c817c11dc2705b00d9303d5d1e984b70b
2016-12-07Merge "Add junit target as replacement for junit-targetdex"Paul Duffin
2016-12-07Merge "Remove unused junit target"Paul Duffin
2016-12-06Add junit target as replacement for junit-targetdexPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: I36d8f6b759ca2cdba04471bb03fb430c9c183fea
2016-12-01Remove unused junit targetPaul Duffin
The final step in the change to rename junit target to junit-host. Bug: 30188076 Test: make checkbuild Change-Id: Ida3de60b0e1ea14aeaa16abd64da55026c853728
2016-12-01Merge "Reapply "Removed unused targets""Paul Duffin
am: 1209899b1c Change-Id: Iadf3ad578341fc424ce6148b82ae5a2da0b2a034
2016-12-01Merge "Reapply "Removed unused targets""Paul Duffin
2016-11-30Reapply "Removed unused targets"Paul Duffin
This reapplies commit 745e053b0b96f1b8ff30d93758be0441d9e78b93. Test: make checkbuild Change-Id: I81220f38b9d7fdede694331e457d88a166c39464
2016-11-30Merge "Revert "Removed unused targets""Paul Duffin
am: 9300374b4f Change-Id: I337dd9045d073f2b852c92475d2d69359af0f1a6
2016-11-30Merge "Revert "Removed unused targets""Paul Duffin
2016-11-30Revert "Removed unused targets"Paul Duffin
This reverts commit 745e053b0b96f1b8ff30d93758be0441d9e78b93. Change-Id: Ib39ef4eadaf3ecdb9795e115127efeabf6d44bdc
2016-11-30Merge "Removed unused targets"Paul Duffin
am: 37e5f7a0cb Change-Id: I63171dd9024fab73b685ed7952d570c0cf931827
2016-11-30Merge "Removed unused targets"Paul Duffin
2016-11-29Removed unused targetsPaul Duffin
Removes: * core-junit-hostdex * junit-runner-hostdex * junit4-target-nodeps * junit4-target-hostdex Bug: 30188076 Test: make checkbuild Change-Id: If7313dad3e9d313cd950f187d0cf5dfd675d3a74
2016-11-29Merge "Added core-junit-static for use by frameworks/base/legacy-test"Paul Duffin
am: 0547748be0 Change-Id: Ia82b9c24fae4e8eeac4322d22156e0cffb6ef8a0
2016-11-29Merge "Added core-junit-static for use by frameworks/base/legacy-test"Paul Duffin
2016-11-29Merge "Change junit-targetdex to contain all JUnit classes"Paul Duffin
am: 172e38f556 Change-Id: I6a50e230fa468be31946b8a1007a20d08c39a76e
2016-11-29Added core-junit-static for use by frameworks/base/legacy-testPaul Duffin
This is the same as core-junit but it is built for use in LOCAL_STATIC_JAVA_LIBRARIES. It is intended to be used by the legacy-test target and will be removed once the source files for the legacy JUnit classes that are built into core-junit are moved to frameworks/base/legacy-test. Bug: 30188076 Test: make checkbuild cts droid Change-Id: Ie0f441da14337669df4e6aa45c1e6b4bd59687dc
2016-11-29Merge "Change junit-targetdex to contain all JUnit classes"Paul Duffin
2016-11-28Change junit-targetdex to contain all JUnit classesPaul Duffin
Bug: 30188076 Test: make checkbuild and ran various CTS modules, including CtsLibcoreOjTestCases Change-Id: Ie889268e6b7c9933c248e532f4ffcca119fb9a0e
2016-11-25Merge changes I42b96dc6,Iace68634Paul Duffin
am: c6d1951d8c Change-Id: I2744b74741a4de3c8b304c32f0902c55a3bfddfd
2016-11-25Change junit-hostdex to contain all JUnit classesPaul Duffin
am: 8e4aa75bbd Change-Id: I8eae768789de60048806a9af0e26d6d6b0a8c1bb
2016-11-25Remove legacy 3.8.1 classesPaul Duffin
am: 743bb726af Change-Id: I2c8d6dda1bf0d941b535338e5e6435bdd27ca9aa
2016-11-25Merge "Add junit-host and make junit an alias for it"Paul Duffin
am: 5cf160ee9a Change-Id: Iaafbaaab91b0dfe3252b288010345723162cef1a
2016-11-25Merge changes I42b96dc6,Iace68634Paul Duffin
* changes: Change junit-hostdex to contain all JUnit classes Remove legacy 3.8.1 classes
2016-11-25Change junit-hostdex to contain all JUnit classesPaul Duffin
Bug: 30188076 Test: make checkbuild Change-Id: I42b96dc6ca05e506a164a7aad1b75b7eaf4e18cf
2016-11-25Remove legacy 3.8.1 classesPaul Duffin
Not all the 3.8.1 classes can be removed as some are referenced from the public API. Bug: 30188076 Test: make checkbuild Change-Id: Iace686343ccb9055ef79ac651e8ef4b173a91738
2016-11-25Merge "Add junit-host and make junit an alias for it"Paul Duffin
2016-11-24Add junit-host and make junit an alias for itPaul Duffin
The junit build target breaks naming conventions. A target built for the host should have a -host suffix. This change is the first step in correcting that before adding any new targets. The next step is to replace all usages of junit target to junit-host, including some in goog/master. The step after that is to remove the junit target itself. Bug: 30188076 Test: make checkbuild Change-Id: Icaa8770a460b06e514ecc8813f6d70c2b9c526d3
2016-11-24Merge "Move JUnit classes from frameworks/base/test-runner to here"Paul Duffin
am: f7fb4fd231 Change-Id: I42e94f98254bd88080e8cfa4205982dc52804537
2016-11-24Merge "Move JUnit classes from frameworks/base/test-runner to here"Paul Duffin
2016-11-22Move JUnit classes from frameworks/base/test-runner to herePaul Duffin
Checked that android.test.runner had the same classes in as before the change. These are legacy 3.8.1 classes that do not exist in 4.10. They can be removed but will do that as part of the upgrade to 4.12. Bug: 30188076 Test: Built android.test.runner and checkapi Change-Id: Iafc41c347276aec9ee03e597182ff36cb3463f5b
2016-05-03Merge "Extra generic type information to aid certain javacs." am: b88e8ddc52 ↵Ian Rogers
am: d4399625aa am: 2e7552431c * commit '2e7552431cce028d5c9eba8e8cd5b2e4709215aa': Extra generic type information to aid certain javacs. Change-Id: I426b94a2928ad8880d1cfe86643eef3c3168b4d2
2016-05-03Merge "Extra generic type information to aid certain javacs." am: b88e8ddc52android-n-mr1-preview-2android-n-mr1-preview-1Ian Rogers
am: d4399625aa * commit 'd4399625aaa4c41d460f80df334b322b170bbfb3': Extra generic type information to aid certain javacs. Change-Id: Id609e78cc6429dcffeb5f44ca201ed6181e5009b
2016-05-03Merge "Extra generic type information to aid certain javacs."Ian Rogers
am: b88e8ddc52 * commit 'b88e8ddc52991f6b9f4e49b6a882dc6bc96ea35f': Extra generic type information to aid certain javacs. Change-Id: Iccecb4f4e91dcb142ce0df1caae01259721c2a14
2016-05-03Merge "Extra generic type information to aid certain javacs."android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Ian Rogers
2016-04-29Extra generic type information to aid certain javacs.Ian Rogers
In particular this is needed for the code to compile using the error prone analyzer. Bug: 27723540 Change-Id: I07b1e94da05a26d214d4c274483d0b0d036a30bc
2015-12-24Merge "Add core-oj to the list of dependencies"android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releasenougat-devNarayan Kamath
am: 3d48bd3d08 * commit '3d48bd3d08a433fda3135a6ab4fbf8803e9c50b3': Add core-oj to the list of dependencies
2015-12-24Merge "Add core-oj to the list of dependencies"android-n-preview-2android-n-preview-1Narayan Kamath
2015-12-22Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak
(cherry picked from commit 5b903deb74ff89bdff3856a317c87999417ec89a) Change-Id: I13aaf3be811773377b652adb263a0be5465e8f4b
2015-11-19Add core-oj to the list of dependenciesPrzemyslaw Szczepaniak
Change-Id: I99a3f78254051244cfffc9f4e40b6d2a03306403
2015-10-27Merge "Move makefile comment to separate line" am: 3d960ddd27Colin Cross
am: 48612f9cb6 * commit '48612f9cb61795627aea54e7b66a12d9a457fa9a': Move makefile comment to separate line
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 10:42:51 +0000