83f0d8dc18
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)"
2017-05-08 19:54:38 +00:00
ddc9c28ca8
Prepare for removal of junit and android.test classes from Android API (step 1)
...
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
2017-05-08 15:35:04 +01:00
f58518ea9c
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-03 02:12:14 +00:00
76116a45b7
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:25:20 +00:00
7cf67d843c
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:25:15 +00:00
fdd8c4bbee
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:20:25 +00:00
dfd4523ad3
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:18:34 +00:00
3d0304f5b6
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-04-02 08:18:19 +00:00
d860ee678b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I33c7a3e55084f5f827b1833fed0142e800a38950
2017-04-02 00:32:09 -07:00
29cce21e61
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I6b9237cb556259ed9803ae1bef977d284d93d618
2017-04-02 00:26:01 -07:00
f382c4e096
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I383339746de9527c4a03e2e73697771f9c2310da
2017-04-02 00:24:59 -07:00
feb7f2e702
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I6f0c71c1cf7d5fda940bcc2a164ccef590d1db4d
2017-04-02 00:24:17 -07:00
81eb1564c0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: Ia1da75e3245c7fd496cf2874661b52a32ca24fd1
2017-04-02 00:23:17 -07:00
10a4a49b98
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I445089565caa6c65a090b8f09a6b6502c32c2de0
2017-04-02 00:22:44 -07:00
dbb769aed7
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I1982e54320535710dbdc834c27ef2d1fa8943d2b
2017-04-02 00:22:00 -07:00
fb431861f0
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: f304362edc
2017-02-16 15:50:04 +00:00
928988f12e
Import translations. DO NOT MERGE
...
am: 4cf3910930
2017-02-16 15:49:51 +00:00
f304362edc
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-16 15:44:48 +00:00
7e02846f06
Import translations. DO NOT MERGE
...
Change-Id: I65cc4ee1caea5d9d8e9a704549175e52611ba0b9
Auto-generated-cl: translation import
2017-02-15 17:46:19 -08:00
4cf3910930
Import translations. DO NOT MERGE
...
Change-Id: If68282123e97f900198a68725a1a98dc633115b7
Auto-generated-cl: translation import
2017-02-15 17:29:43 -08:00
3b34a40c74
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 384007ac74
2017-02-03 08:37:34 +00:00
a7290ad7ea
Import translations. DO NOT MERGE
...
am: dd6d694fcb
2017-02-03 08:37:33 +00:00
6fd8b916aa
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 7dbc639446
2017-02-03 08:37:16 +00:00
28f6dcc8ef
Import translations. DO NOT MERGE
...
am: 2b39ab6454
2017-02-03 08:37:14 +00:00
384007ac74
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-03 08:27:07 +00:00
7dbc639446
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-03 08:18:50 +00:00
331ef5f593
Import translations. DO NOT MERGE
...
am: 99348c75da
2017-02-03 08:10:41 +00:00
2b39ab6454
Import translations. DO NOT MERGE
...
Change-Id: I9a224565bb46caa20ead911a74702c773ea2a282
Auto-generated-cl: translation import
2017-02-02 22:46:47 -08:00
dd6d694fcb
Import translations. DO NOT MERGE
...
Change-Id: I7796f5a735a49337ada20e07143db34574a40017
Auto-generated-cl: translation import
2017-02-02 22:39:50 -08:00
99348c75da
Import translations. DO NOT MERGE
...
Change-Id: I81c09641bd1dd7c3366bb9de425888c0f536763e
Auto-generated-cl: translation import
2017-02-02 22:39:00 -08:00
2cb8e19413
Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191
...
am: 17a53d5e94
2016-11-30 13:44:29 +00:00
17a53d5e94
Merge "Use junit-host instead of junit" am: 8293d4f266
...
am: e4ea7e8191
2016-11-30 13:39:59 +00:00
e4ea7e8191
Merge "Use junit-host instead of junit"
...
am: 8293d4f266
2016-11-30 13:34:27 +00:00
8293d4f266
Merge "Use junit-host instead of junit"
2016-11-30 13:27:38 +00:00
982f0fa29f
Use junit-host instead of junit
...
Use framework/junit-host.jar instead of framework/junit.jar
Ran the script before and after making the change and it failed
in the same way with a build error but it was not due to a
problem with JUnit.
Bug: 30188076
Test: make checkbuild and ran the test-dicttool.sh script
Change-Id: I4cdd518f38184ff3ade5a06d968d6902770ece6b
2016-11-30 11:24:59 +00:00
2e570aae72
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 634fc5a417 -s ours
...
am: efa89be550
2016-11-21 02:28:28 +00:00
4dca30a227
Import translations. DO NOT MERGE am: 11443a10b9 -s ours
...
am: 3bbc35a294
2016-11-21 02:28:12 +00:00
b2bce8b718
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 60a9f4ca18 -s ours
...
am: e869c4ef32
2016-11-21 02:27:58 +00:00
d3e14b8420
Import translations. DO NOT MERGE am: e8b1aebb88 -s ours
...
am: 489f0674c8
2016-11-21 02:27:45 +00:00
cfcd277022
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ffefbfdb9d -s ours
...
am: 630fac14b8
2016-11-21 02:27:31 +00:00
14bd1b3c7c
Import translations. DO NOT MERGE am: 6da15efecc -s ours
...
am: bed39c40ee
2016-11-21 02:27:17 +00:00
f73f2bd9c5
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e6d2b89ce3 -s ours
...
am: 01d3fde036
2016-11-21 02:27:02 +00:00
ff7812de7c
Import translations. DO NOT MERGE am: 5ef922800e -s ours
...
am: 11a1ebd4da
2016-11-21 02:26:48 +00:00
30490326a6
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 417d745e6d -s ours
...
am: f642db22e1
2016-11-21 02:26:33 +00:00
aa0a5d6e25
Import translations. DO NOT MERGE am: 1e7141667f -s ours
...
am: df37d62628
2016-11-21 02:26:18 +00:00
d443682c5f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: abfce3ccd8 -s ours
...
am: 2ceb4450ae
2016-11-21 02:26:04 +00:00
90051a1b11
Import translations. DO NOT MERGE am: 1834716f17 -s ours
...
am: 28255a7813
2016-11-21 02:25:48 +00:00
6d4b3a0280
Import translations. DO NOT MERGE am: 9be2112b57 -s ours
...
am: 2729361edd
2016-11-21 02:25:34 +00:00
efa89be550
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: 634fc5a417
2016-11-21 02:05:51 +00:00
3bbc35a294
Import translations. DO NOT MERGE
...
am: 11443a10b9
2016-11-21 02:05:50 +00:00
Paul Duffin
Bill Yi
TreeHugger Robot