Commits · 592e1cc567013ec24d0bef407621a6d216ced485 · CodeLinaro / public-release-test-restored / platform / external / junit

Oct 25, 2018

[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE... · 592e1cc5

Bill Yi authored 6 years ago

[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c1ef6050  -s ours am: 621f17ce  -s ours
am: d580604d  -s ours

Change-Id: Id429a81bdfaa3990a6ec0268369d9b0e58844d1d

592e1cc5

[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE... · d580604d

Bill Yi authored 6 years ago

[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c1ef6050  -s ours
am: 621f17ce  -s ours

Change-Id: I6eac450a4b4d38d22dc137fdcd0d79bc621ee9ff

d580604d

Oct 24, 2018
- [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE · 621f17ce
  Bill Yi authored 6 years ago
```
am: c1ef6050  -s ours

Change-Id: I5b855d3194c4227d3128aa69b0bbc8c9b7409c54
```
  621f17ce
- Merge pie-platform-release to aosp-master - DO NOT MERGE · c1ef6050
  Bill Yi authored 6 years ago
```
Change-Id: Iee4435844038a2441dac626e3be73e714899174b
```
  c1ef6050
- [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT... · 90567c1b
  Bill Yi authored 6 years ago
```
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 245b5d78  -s ours
am: 98af04ef  -s ours

Change-Id: I9934dffb30d736eaa8669b957cb39621de79d449
```
  90567c1b
- [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE · 98af04ef
  Bill Yi authored 6 years ago
```
am: 245b5d78  -s ours

Change-Id: I46c0b565001101ab63e518511b0fa9959e462086
```
  98af04ef
- Merge pi-platform-release to stage-aosp-master - DO NOT MERGE · 245b5d78
  Bill Yi authored 6 years ago
```
Change-Id: I291595b1a7e83c3fe2c31e15725a4815ead20a40
```
  245b5d78
Sep 14, 2018
- Merge "Add METADATA for junit" am: 351e57bb am: cf299a20 · 46d433d0
  Haibo Huang authored 6 years ago
```
am: 864b0829

Change-Id: I8fefb399d9d58b66f3706937d5330d878fd3982a
```
  46d433d0
- Merge "Add METADATA for junit" am: 351e57bb · 864b0829
  Haibo Huang authored 6 years ago
```
am: cf299a20

Change-Id: I948e185bc288b3ebbc39e50b24fdfb53a568d8e7
```
  864b0829
- Merge "Add METADATA for junit" · cf299a20
  Haibo Huang authored 6 years ago
```
am: 351e57bb

Change-Id: I740b55d9f0a3e8d583ddf73535992d2e9ebf6908
```
  cf299a20
- Merge "Add METADATA for junit" · 351e57bb
  Haibo Huang authored 6 years ago
  
  351e57bb
Sep 11, 2018
- Add METADATA for junit · 980e42c9
  Haibo Huang authored 6 years ago
```
Test: NA
Change-Id: I11614706eec6db16745de71811ae73b25d5f4e95
```
  980e42c9
Feb 07, 2018
- Snap for 4590521 from c6719592 to pi-release · eab23aff
  android-build-team Robot authored 7 years ago
```
Change-Id: Ica27e523fae0752db35e92ac6479cd38d077f203
```
  eab23aff
- Merge "Build junit with core_current" am: b52b6b01 am: 697eeee7 · c6719592
  Jiyong Park authored 7 years ago
```
am: 14abea3a

Change-Id: I15a1c84fd41e11ac2e5b5f43907d3ad0c881007f
```
  c6719592
Feb 06, 2018
- Merge "Build junit with core_current" am: b52b6b01 · 14abea3a
  Jiyong Park authored 7 years ago
```
am: 697eeee7

Change-Id: I04fb41ecaceb05af551bb5a2d60a2a4cf7132855
```
  14abea3a
- Merge "Build junit with core_current" · 697eeee7
  Jiyong Park authored 7 years ago
```
am: b52b6b01

Change-Id: I25a73427aca49038a7cea1df5aae8fc8b06e67f4
```
  697eeee7
- Merge "Build junit with core_current" · b52b6b01
  Treehugger Robot authored 7 years ago
  
  b52b6b01
Jan 31, 2018

Build junit with core_current · cf747f14

Jiyong Park authored 7 years ago

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

cf747f14

Oct 13, 2017
- Snap for 4393550 from 1a835569 to pi-release · 09762e54
  android-build-team Robot authored 7 years ago
```
Change-Id: I7c9a3927898fd1b61ed173f31d678c3c9510e491
```
  09762e54
Oct 12, 2017
- Merge "Convert external/junit to Android.bp" am: 88533453 am: 833c14ed am: d9fab9d8 · 1a835569
  Colin Cross authored 7 years ago
```
am: 6f3aa138

Change-Id: I1abea99c3510b9cd11567b59591c0f15444f425d
```
  1a835569
Oct 11, 2017
- Merge "Convert external/junit to Android.bp" am: 88533453 am: 833c14ed · 6f3aa138
  Colin Cross authored 7 years ago
```
am: d9fab9d8

Change-Id: I76080f28197eedf2be2f8591913ea73a0dfa1fd7
```
  6f3aa138
- Merge "Convert external/junit to Android.bp" am: 88533453 · d9fab9d8
  Colin Cross authored 7 years ago
```
am: 833c14ed

Change-Id: Id32deefaeb30c835c09c788912597f0ee43461cc
```
  d9fab9d8
- Merge "Convert external/junit to Android.bp" · 833c14ed
  Colin Cross authored 7 years ago
```
am: 88533453

Change-Id: Ia34bb6364ad04f69ee9efa1c28c2b55bcfbddaf5
```
  833c14ed
- Merge "Convert external/junit to Android.bp" · 88533453
  Colin Cross authored 7 years ago
  
  88533453
Oct 09, 2017

Convert external/junit to Android.bp · e826dfd8

Colin Cross authored 7 years ago

See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: Iccb21a6735b67301c96a9fc1f92face76f499244

e826dfd8

Apr 18, 2017
- Merge "add OWNERS to junit" am: 2faf8f4a am: 95c26874 am: f7d7d876 · df26755a
  Chih-hung Hsieh authored 7 years ago
```
am: 18fb5125

Change-Id: I979781e79de137d69c63120dc285e9e826a4c423
```
  df26755a
- Merge "add OWNERS to junit" am: 2faf8f4a am: 95c26874 · 18fb5125
  Chih-hung Hsieh authored 7 years ago
```
am: f7d7d876

Change-Id: Ie03d62656d834397807ee8edcfa8e30a5d0a2f81
```
  18fb5125
- Merge "add OWNERS to junit" am: 2faf8f4a · f7d7d876
  Chih-hung Hsieh authored 7 years ago
```
am: 95c26874

Change-Id: Ib3338ce400ba023b64af2f3c10d9688ac2eaa6f4
```
  f7d7d876
- Merge "add OWNERS to junit" · 95c26874
  Chih-hung Hsieh authored 7 years ago
```
am: 2faf8f4a

Change-Id: I7248cd136daccf6e8c91edc66a6641f099d2dcc2
```
  95c26874
- Merge "add OWNERS to junit" · 2faf8f4a
  Chih-hung Hsieh authored 7 years ago
  
  2faf8f4a
Apr 17, 2017

add OWNERS to junit · b07a426e

Chih-Hung Hsieh authored 7 years ago

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I6d5ed2c9c76025cdfd9757dbeb5eb2c5c8887567

b07a426e

Feb 24, 2017
- Merge changes from topic 'upgrade-hamcrest-to-2.0' am: a5651492 am: a4abf50c · 9600e973
  Paul Duffin authored 8 years ago
```
am: ec7ba37c

Change-Id: Id050d56e8f8442f413f17bb89314ade516a800ac
```
  9600e973
- Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1" am: facdecc8 am: 44deb443 · 00bf3bd1
  Paul Duffin authored 8 years ago
```
am: d4c13f28

Change-Id: I90e00572b11dfff5ad6f59819d9cf6b65f62a3cb
```
  00bf3bd1
- Merge changes from topic 'upgrade-hamcrest-to-2.0' am: a5651492 · ec7ba37c
  Paul Duffin authored 8 years ago
```
am: a4abf50c

Change-Id: If9cdccb1d27c91084021e481b998fddb860a84c2
```
  ec7ba37c
- Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1" am: facdecc8 · d4c13f28
  Paul Duffin authored 8 years ago
```
am: 44deb443

Change-Id: Ieb0bfc27f5e64d89a0ddb37abf15579c1a0e0697
```
  d4c13f28
- Merge changes from topic 'upgrade-hamcrest-to-2.0' · a4abf50c
  Paul Duffin authored 8 years ago
```
am: a5651492

Change-Id: I07fbfb874b63dda6e1c2ebf19c75cff709059779
```
  a4abf50c
- Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1" · 44deb443
  Paul Duffin authored 8 years ago
```
am: facdecc8

Change-Id: I66362f845bb8f67fa8bbd570a4cd06984e4053f1
```
  44deb443
- Merge changes from topic 'upgrade-hamcrest-to-2.0' · a5651492
  Paul Duffin authored 8 years ago
```
* changes:
  Allow JUnit to compile against external/hamcrest v2.0
  Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1"
```
  a5651492
Jan 25, 2017
- Allow JUnit to compile against external/hamcrest v2.0 · ccc794a9
  Paul Duffin authored 8 years ago
```
Bug: 30946317
Test: make checkbuild
Change-Id: Idbeddca3346d43ed39cdbb0c6e44779b54f981a4
```
  ccc794a9
Jan 23, 2017

Revert "Revert matchers back to 4.10 to compile against Hamcrest 1.1" · facdecc8

Paul Duffin authored 8 years ago

This reverts commit 86f323b2.

Bug: 30946317
Test: make checkbuild
Change-Id: Ie72fec656d01f24a1724d33a35ceecdb57aaba57

facdecc8