Commits · 381c38a127bf9a491b2084f76794c9bc5ae36789 · keyboard / LatinIME

May 10, 2017

Prepare for removal of junit and android.test classes from Android API (step 1) · 381c38a1

Paul Duffin authored 8 years ago

In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: Icf844999082db141cffcb099aa4004afc7a7c749
Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2

381c38a1

May 08, 2017

Merge "Prepare for removal of junit and android.test classes from Android API... · 439ca466

Paul Duffin authored 7 years ago

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc am: 341a052c
am: 5151513a -s ours

Change-Id: I1551963c45f5d4b94d1fe42d3405350eda4ca389

439ca466

Merge "Prepare for removal of junit and android.test classes from Android API... · 5151513a

Paul Duffin authored 7 years ago

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: 83f0d8dc
am: 341a052c

Change-Id: I32b078a3fbb028bf9f925be3613287ba2bbd9a0d

5151513a

Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" · 341a052c
Paul Duffin authored 7 years ago
```
am: 83f0d8dc

Change-Id: If0e4bdafb4e4451315b5a7270cfe9526d65b38f4
```
341a052c
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" · 83f0d8dc
Paul Duffin authored 7 years ago

83f0d8dc

Prepare for removal of junit and android.test classes from Android API (step 1) · ddc9c28c

Paul Duffin authored 8 years ago

In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: I160c136ecd1089a2b13d5cdba9eee1287aad93f9
Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2

ddc9c28c

May 02, 2017
- Merge "Use AAPT2" into oc-dev · c53f1fbe
  Alan Viverette authored 7 years ago
  
  am: a9d9daeb Change-Id: I1c3cf78d426e298d81d1d255c315d4ed95b15afb
  c53f1fbe
- Merge "Use AAPT2" into oc-dev · a9d9daeb
  TreeHugger Robot authored 7 years ago
  
  a9d9daeb
Apr 29, 2017
- Merge "Import translations. DO NOT MERGE" into oc-dev · 9ec6cef0
  Bill Yi authored 7 years ago
  
  am: 2e0a752f -s ours Change-Id: Id259fc90bee8486de44461f74c250b066abe7e4d
  9ec6cef0
- Merge "Import translations. DO NOT MERGE" into oc-dev · ba04db40
  Bill Yi authored 7 years ago
  
  am: d0a66300 -s ours Change-Id: I5bdfc474cabd8734d6de0845ff989d314b4fcfcd
  ba04db40
- Merge "Import translations. DO NOT MERGE" into oc-dev · 2e0a752f
  TreeHugger Robot authored 7 years ago
  
  2e0a752f
- Merge "Import translations. DO NOT MERGE" into oc-dev · 759445f0
  Bill Yi authored 7 years ago
  
  am: f2620187 -s ours Change-Id: I91ee52ad8985fb4986649cee89e6d5bef96f76ac
  759445f0
- Merge "Import translations. DO NOT MERGE" into oc-dev · c0f5daee
  Bill Yi authored 7 years ago
  
  am: b9996623 -s ours Change-Id: I0db32e9c8a308037ed7e93ea996f12a38c400be7
  c0f5daee
- Merge "Import translations. DO NOT MERGE" into oc-dev · d0a66300
  TreeHugger Robot authored 7 years ago
  
  d0a66300
- Import translations. DO NOT MERGE · 79036f39
  Bill Yi authored 7 years ago
  
  am: bd1947dc -s ours Change-Id: Ic694a675584beee381663e01f0aacd48d868c2f2
  79036f39
- Merge "Import translations. DO NOT MERGE" into oc-dev · f2620187
  TreeHugger Robot authored 7 years ago
  
  f2620187
- Merge "Import translations. DO NOT MERGE" into oc-dev · b9996623
  TreeHugger Robot authored 7 years ago
  
  b9996623
- Import translations. DO NOT MERGE · 0f8cdf43
  Bill Yi authored 7 years ago
  
  Change-Id: Ide2d46f805a5bb36b32d6ebaec8d987973b816ab Auto-generated-cl: translation import
  0f8cdf43
- Import translations. DO NOT MERGE · bd1947dc
  Bill Yi authored 7 years ago
  
  Change-Id: I98560e277103ff606353cff46889ecdb4d7a3b86 Auto-generated-cl: translation import
  bd1947dc
- Import translations. DO NOT MERGE · cbb6f377
  Bill Yi authored 7 years ago
  
  Change-Id: I19cf3418e3bb56a10729741b0d7514533a92f6be Auto-generated-cl: translation import
  cbb6f377
- Import translations. DO NOT MERGE · 8f9249c4
  Bill Yi authored 7 years ago
  
  Change-Id: I13becab3eb65dbb5466387d2781af7226f8dee0e Auto-generated-cl: translation import
  8f9249c4
- Import translations. DO NOT MERGE · ac0f5e0a
  Bill Yi authored 7 years ago
  
  Change-Id: Ib3dc9dfc6748012de4882a5421993b7bbe825deb Auto-generated-cl: translation import
  ac0f5e0a
Apr 26, 2017

Use AAPT2 · 0f6f5c01

Alan Viverette authored 7 years ago

Test: make checkbuild
Change-Id: I8478dd61a2edf8f87437276025ed57092c1b047c

0f6f5c01

Apr 11, 2017
- Merge "Import translations. DO NOT MERGE" into oc-dev · 270c407f
  Bill Yi authored 7 years ago
  
  am: 0a472ed0 -s ours Change-Id: I5384c6783fb5138da74d8c9229738d66663680fc
  270c407f
- Import translations. DO NOT MERGE · c0c8f3b8
  Bill Yi authored 7 years ago
  
  am: 8e3bb06f -s ours Change-Id: I497a842d973e5143d247145589d35105cec2a356
  c0c8f3b8
- Merge "Import translations. DO NOT MERGE" into oc-dev · 0a472ed0
  TreeHugger Robot authored 7 years ago
  
  0a472ed0
- Import translations. DO NOT MERGE · 8e3bb06f
  Bill Yi authored 7 years ago
  
  Change-Id: Ia6a62ea85b0a61cf94e4dbe20bddcb5aa0e99eba Auto-generated-cl: translation import
  8e3bb06f
- Import translations. DO NOT MERGE · 74702b9a
  Bill Yi authored 7 years ago
  
  Change-Id: I57c2a9e284ad880ee56a8d40bf88a02a74554069 Auto-generated-cl: translation import
  74702b9a
Apr 03, 2017
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f58518ea -s ours · 574742b4
  Bill Yi authored 7 years ago
  
  am: 84e782d4 -s ours Change-Id: I897c8e18fc27236fbc41837c75bc85d8e58e0fe3
  574742b4
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master · 84e782d4
  Bill Yi authored 7 years ago
  
  am: f58518ea -s ours Change-Id: I1980105f452b67b4fd87d331e27452805f72f7c8
  84e782d4
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master · f58518ea
  Bill Yi authored 7 years ago
  
  f58518ea
Apr 02, 2017
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 76116a45 -s ours · 15971301
  Bill Yi authored 7 years ago
  
  am: 593bf077 -s ours Change-Id: Ic19affac57005e7f2f066f3d5899e4fe5bedf05b
  15971301
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7cf67d84 -s ours · 70dfb95c
  Bill Yi authored 7 years ago
  
  am: cb19e711 -s ours Change-Id: I00aa5ae2a9348676fde34aff13aae685be1bff29
  70dfb95c
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master · 593bf077
  Bill Yi authored 7 years ago
  
  am: 76116a45 -s ours Change-Id: Icb8bc8924865fd894c020441863d0cba4ccf4730
  593bf077
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master · cb19e711
  Bill Yi authored 7 years ago
  
  am: 7cf67d84 -s ours Change-Id: I17724c446841088e5298753ffbd9499e51a46bd3
  cb19e711
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fdd8c4bb -s ours · 45adfd8a
  Bill Yi authored 7 years ago
  
  am: 3b5113a4 -s ours Change-Id: I35e875428f30d65354af60228d90a8d4ad5af790
  45adfd8a
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: dfd4523a -s ours · 69802b75
  Bill Yi authored 7 years ago
  
  am: d7247851 -s ours Change-Id: Id189041164770a92dd3c215cf3eed30a16eb9f3d
  69802b75
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master · 76116a45
  TreeHugger Robot authored 7 years ago
  
  76116a45
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master · 7cf67d84
  TreeHugger Robot authored 7 years ago
  
  7cf67d84
- Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3d0304f5 -s ours · bb390ff2
  Bill Yi authored 7 years ago
  
  am: 4e1a184d -s ours Change-Id: I7b493d62f45f0b36b036a200ea76c307c477dddc
  bb390ff2