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

Apr 18, 2017
- 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

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 · 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

Jan 21, 2017
- Merge "Remove junit4-target" am: 7323bf63 am: 3151d404 · bbbc818f
  Paul Duffin authored 8 years ago
```
am: e3b284d3

Change-Id: Iaf02f33a44a3b52bb7917d0a1ced162f1e0b14d4
```
  bbbc818f
- Merge "Remove junit4-target" am: 7323bf63 · e3b284d3
  Paul Duffin authored 8 years ago
```
am: 3151d404

Change-Id: Ie9f6fb21c5b4c1d6b09a28fd51617185b739fda7
```
  e3b284d3
- Merge "Remove junit4-target" · 3151d404
  Paul Duffin authored 8 years ago
```
am: 7323bf63

Change-Id: Ia7b468a059ccc0a2d2061587383ca0006bfec4d7
```
  3151d404
- Merge "Remove junit4-target" · 7323bf63
  Treehugger Robot authored 8 years ago
  
  7323bf63
Jan 20, 2017
- Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am: 9dd4dbb0 am: 2933ae21 · 83b9cd93
  Colin Cross authored 8 years ago
```
am: c1600bcf

Change-Id: Ib54435dcc6a415f2e4e8438b4e4fe8365cf66361
```
  83b9cd93
- Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" am: 9dd4dbb0 · c1600bcf
  Colin Cross authored 8 years ago
```
am: 2933ae21

Change-Id: I6469d292950d2439f71e0d9128b7591f5b5b7151
```
  c1600bcf
- Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" · 2933ae21
  Colin Cross authored 8 years ago
```
am: 9dd4dbb0

Change-Id: I132c36e93f195769b1cd5630ddc62da1d1b20219
```
  2933ae21
- Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex" · 9dd4dbb0
  Colin Cross authored 8 years ago
  
  9dd4dbb0
- Remove junit4-target · 27e1d7f4
  Paul Duffin authored 8 years ago
```
Bug: 30188076
Test: make checkbuild
Change-Id: I7804006b0b35a7115dcf5c68f586dea99fb770dc
```
  27e1d7f4
Jan 19, 2017

Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for junit-hostdex · 4b5c120e

Colin Cross authored 8 years ago

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

4b5c120e

Jan 10, 2017
- Merge changes from topic 'upgrade-junit4.12' am: 7cfdf040 am: 535e1439 · 72def511
  Paul Duffin authored 8 years ago
```
am: 5711c1a8

Change-Id: I7fc6019deadb6251db8243cf2862d39701054120
```
  72def511
- Extra generic type information to aid certain javacs. am: a0b1fd67 am: 472f7143 · 08c64682
  Ian Rogers authored 8 years ago
```
am: bc00960c

Change-Id: Ic382f2e0bae783532c2dc95672a545d5add7059f
```
  08c64682
- Revert matchers back to 4.10 to compile against Hamcrest 1.1 am: 86f323b2 am: e20af479 · cd58d390
  Paul Duffin authored 8 years ago
```
am: 0453c6d6

Change-Id: I513c274dc6ce48cd6b02679d37461efac7131688
```
  cd58d390
- Remove support for stuck threads am: 4156f43b am: b00f6c54 · 72f680fa
  Paul Duffin authored 8 years ago
```
am: 47d047cb

Change-Id: I26aec5f76480655f1dd323d4b7052e2c2c1174e2
```
  72f680fa
- Remove DisableOnDebug (new in 4.12) as it is not supported on Android am: c8055484 am: 25b39d4c · b5af667c
  Paul Duffin authored 8 years ago
```
am: 8459641e

Change-Id: I9244a1a964db8fce2d7326e2b15e27b17287552c
```
  b5af667c
- Upgrade to JUnit 4.12 am: aeb93fc3 am: 25a6c4cb · 418644b5
  Paul Duffin authored 8 years ago
```
am: 43201a73

Change-Id: I637dc2574c8f78c6d6dd1f093705ac90a854d684
```
  418644b5
- Merge changes from topic 'upgrade-junit4.12' am: 7cfdf040 · 5711c1a8
  Paul Duffin authored 8 years ago
```
am: 535e1439

Change-Id: Ifa4309f23af7dfd855810d5206198962805e68d3
```
  5711c1a8
- Extra generic type information to aid certain javacs. am: a0b1fd67 · bc00960c
  Ian Rogers authored 8 years ago
```
am: 472f7143

Change-Id: Ia83ae1a5c53948dc520303362dd5dceb94e4bb88
```
  bc00960c
- Revert matchers back to 4.10 to compile against Hamcrest 1.1 am: 86f323b2 · 0453c6d6
  Paul Duffin authored 8 years ago
```
am: e20af479

Change-Id: I47dedcb6db38b18b734059193615a7f1d36ca397
```
  0453c6d6
- Remove support for stuck threads am: 4156f43b · 47d047cb
  Paul Duffin authored 8 years ago
```
am: b00f6c54

Change-Id: I133918dba540c7bde620e8e77dddf6f251d3b611
```
  47d047cb
- Remove DisableOnDebug (new in 4.12) as it is not supported on Android am: c8055484 · 8459641e
  Paul Duffin authored 8 years ago
```
am: 25b39d4c

Change-Id: I9d7b1590336e68fab9268c2c0322fa759b02a096
```
  8459641e
- Upgrade to JUnit 4.12 am: aeb93fc3 · 43201a73
  Paul Duffin authored 8 years ago
```
am: 25a6c4cb

Change-Id: I697a6612203ee0212a7588b3ebeea15c0a789b7a
```
  43201a73
- Merge changes from topic 'upgrade-junit4.12' · 535e1439
  Paul Duffin authored 8 years ago
```
am: 7cfdf040

Change-Id: I797e19f5fea35b80a6b23c294a814cf48535e4c2
```
  535e1439
- Extra generic type information to aid certain javacs. · 472f7143
  Ian Rogers authored 8 years ago
```
am: a0b1fd67

Change-Id: I35a7645531de2e1b62910b32ac92fd09c7583f95
```
  472f7143
- Revert matchers back to 4.10 to compile against Hamcrest 1.1 · e20af479
  Paul Duffin authored 8 years ago
```
am: 86f323b2

Change-Id: I01eee1acbeddf862d36fb6284376b97ea98ba4fd
```
  e20af479
- Remove support for stuck threads · b00f6c54
  Paul Duffin authored 8 years ago
```
am: 4156f43b

Change-Id: Ic50259089a10891da7795dd893a6d32d8e7cbc47
```
  b00f6c54
- Remove DisableOnDebug (new in 4.12) as it is not supported on Android · 25b39d4c
  Paul Duffin authored 8 years ago
```
am: c8055484

Change-Id: Ib56d7246b8e7cfe45b7c175657f80fdb1d725fca
```
  25b39d4c
- Upgrade to JUnit 4.12 · 25a6c4cb
  Paul Duffin authored 8 years ago
```
am: aeb93fc3

Change-Id: I205b644f99ff5da426794918c85007de19bcb25d
```
  25a6c4cb
- Merge changes from topic 'upgrade-junit4.12' · 7cfdf040
  Paul Duffin authored 8 years ago
```
* changes:
  Extra generic type information to aid certain javacs.
  Revert matchers back to 4.10 to compile against Hamcrest 1.1
  Remove support for stuck threads
  Remove DisableOnDebug (new in 4.12) as it is not supported on Android
  Upgrade to JUnit 4.12
```
  7cfdf040