aboutsummaryrefslogtreecommitdiffstats
path: root/java/src (unfollow)
Commit message (Collapse)AuthorFilesLines
2017-06-14Fix dependencies of packages that target earlier releasesPaul Duffin1-2/+3
A previous change added legacy-android-test as a static dependency to all packages that build against the current, test_current or system_current and failed to compile when the junit and android.test classes were removed from the API. Unfortunately, those changes did not take into account that some of those packages target earlier API versions and so will always have the classes available at runtime. This change replaces those static dependencies with dynamic dependencies for any package that targets an earlier API version. The file changes were made automatically by a tool that constructed and then analyzed a full dependency graph of all the Android Java modules. The individual changes were checked manually to ensure that the changes matched the intent. The affected modules were built against an API with the junit and android.test classes removed. Any issues found during this process resulted in either the tool being updated to address the issue or a separate change being made to fix an existing problem with the build. A sample of the affected packages were run to ensure that they worked as expected at runtime; no issues were found during testing. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * tests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because LatinIMETests's manifest file (AndroidManifest.xml) targets API level 21 and dynamically includes the android.test.runner library at runtime so there is no point in statically including the classes. Added 'android.test.mock.sdk' and 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module LatinIMETests builds against 'LOCAL_SDK_VERSION := current' and uses classes from packages android.test and android.test.mock (possibly indirectly) so will no longer compile once they are removed from the API. Dependency 'android.test.mock.sdk' is used instead of 'android.test.mock' because module LatinIMETests builds against the API not internal jars and so should use libraries that build against the API not internal jars. A future change will replace the dependency on 'legacy-android-test', which builds against the internal jars with a dependency on 'android.legacy.test' which will build against the API. Bug: 30188076 Test: make checkbuild and ran a sample of tests Change-Id: I63f1a8ad16a76aba0da89b69a64cdae4400af5a0 Merged-In: Icab8a4c4801536f112e29dfd2dc66be8b90b811d
2017-05-08Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin1-1/+4
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-04-02Import translations. DO NOT MERGEBill Yi77-823/+824
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I33c7a3e55084f5f827b1833fed0142e800a38950
2017-04-02Import translations. DO NOT MERGEBill Yi12-18/+18
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I6b9237cb556259ed9803ae1bef977d284d93d618
2017-04-02Import translations. DO NOT MERGEBill Yi2-17/+17
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I383339746de9527c4a03e2e73697771f9c2310da
2017-04-02Import translations. DO NOT MERGEBill Yi23-52/+52
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I6f0c71c1cf7d5fda940bcc2a164ccef590d1db4d
2017-04-02Import translations. DO NOT MERGEBill Yi1-1/+1
Auto-generated-cl: translation import Bug: 36832302 Change-Id: Ia1da75e3245c7fd496cf2874661b52a32ca24fd1
2017-04-02Import translations. DO NOT MERGEBill Yi1-2/+2
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I445089565caa6c65a090b8f09a6b6502c32c2de0
2017-04-02Import translations. DO NOT MERGEBill Yi4-4/+4
Auto-generated-cl: translation import Bug: 36832302 Change-Id: I1982e54320535710dbdc834c27ef2d1fa8943d2b
2017-02-15Import translations. DO NOT MERGEBill Yi2-2/+2
Change-Id: I65cc4ee1caea5d9d8e9a704549175e52611ba0b9 Auto-generated-cl: translation import
2017-02-15Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: If68282123e97f900198a68725a1a98dc633115b7 Auto-generated-cl: translation import
2017-02-02Import translations. DO NOT MERGEBill Yi13-23/+23
Change-Id: I9a224565bb46caa20ead911a74702c773ea2a282 Auto-generated-cl: translation import
2017-02-02Import translations. DO NOT MERGEBill Yi1-2/+2
Change-Id: I7796f5a735a49337ada20e07143db34574a40017 Auto-generated-cl: translation import
2017-02-02Import translations. DO NOT MERGEBill Yi4-6/+6
Change-Id: I81c09641bd1dd7c3366bb9de425888c0f536763e Auto-generated-cl: translation import
2016-11-30Use junit-host instead of junitPaul Duffin2-3/+3
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-20Import translations. DO NOT MERGEBill Yi77-796/+797
Auto-generated-cl: translation import Bug: 32177112 Change-Id: I813a327d9361336da3ea4aac39a6ef0b345263af
2016-11-20Import translations. DO NOT MERGEBill Yi12-16/+16
Auto-generated-cl: translation import Bug: 32177112 Change-Id: Ib276271b318f0e132d02ee9426b5fb5c57e1187f
2016-11-20Import translations. DO NOT MERGEBill Yi2-15/+15
Auto-generated-cl: translation import Bug: 32177112 Change-Id: Id8b1086d2959c82b9bf0501b2ec09f4f06f92a59
2016-11-20Import translations. DO NOT MERGEBill Yi19-41/+41
Auto-generated-cl: translation import Bug: 32177112 Change-Id: I8bfdbfaafe7be003828ac6994781ccffd90310f1
2016-11-20Import translations. DO NOT MERGEBill Yi1-1/+1
Auto-generated-cl: translation import Bug: 32177112 Change-Id: I63f2e9abe968d6a37abef2f6bc3cc200e9a669a8
2016-11-20Import translations. DO NOT MERGEBill Yi1-2/+2
Auto-generated-cl: translation import Bug: 32177112 Change-Id: Ia09fe3c77df78cc2ae3cbf4bd3890295351ba15e
2016-11-20Import translations. DO NOT MERGEBill Yi4-4/+4
Auto-generated-cl: translation import Bug: 32177112 Change-Id: Iee950938a55411791e85a59bf4b91dc7f5cd6df4
2016-11-04Import translations. DO NOT MERGEBill Yi9-18/+18
Change-Id: Ia03258f7092cf254eee5cbb9cc794006fbbda3e2 Auto-generated-cl: translation import
2016-11-04Import translations. DO NOT MERGEBill Yi5-5/+5
Change-Id: I7edc4a9b99815d79a4cc2d6c8df2e2dddf74343f Auto-generated-cl: translation import
2016-11-04Import translations. DO NOT MERGEBill Yi1-14/+14
Change-Id: Id76dd828958ea73f6c9566ad3481c554c2b4eff9 Auto-generated-cl: translation import
2016-11-04Import translations. DO NOT MERGEBill Yi8-10/+10
Change-Id: I8db74df16c0a34a09cf403bf0071cb52899afece Auto-generated-cl: translation import
2016-11-04Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I8c85df793235fee90fc3494dc0d4bff28b7e3c85 Auto-generated-cl: translation import
2016-10-07Rely on the platform -std default.Elliott Hughes5-14/+7
Bug: http://b/32019064 Test: builds Change-Id: I17611b6d9598992bd52cf3dc93509f0f5e0bdcde
2016-09-16Import translations. DO NOT MERGEBill Yi1-1/+1
Auto-generated-cl: translation import Bug: 31516661 Change-Id: Iefd62537286fb7a86e803cc89365f89179be6c99
2016-09-16Import translations. DO NOT MERGEBill Yi1-1/+1
Auto-generated-cl: translation import Bug: 31516661 Change-Id: Ic519aeae675b33fd210e68a069719074d0286695
2016-09-16Import translations. DO NOT MERGEBill Yi1-3/+3
Auto-generated-cl: translation import Bug: 31516661 Change-Id: I5a91790436112a59600ade90f614d628e3d78c12
2016-08-19Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: Idbc7971ac1f307ff73ee02476a49e27230fe90b6 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi5-8/+8
Change-Id: Ia9198deb70d7d4260e0cb5deeae2d3ec4a7ccac8 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi2-2/+2
Change-Id: I0911f20f0e504f22f0a1eacf6bc5a79ad3de1b04 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi3-3/+3
Change-Id: Ia048617176780c2ce26920b1dd4e30355939174a Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I1b323eab107d6745df4053b15009fab0ae0b62bf Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi8-19/+19
Change-Id: Ic28f215f800b2451ea62289861e436b8085725d1 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi3-3/+3
Change-Id: I2af9606d7566a06c5d95e434b6829f091c90c19a Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi6-7/+7
Change-Id: I386959510402127c4d438faf4a5bd271de6153a9 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi2-2/+2
Change-Id: I18054b42e74f64dd71c4ee20bb743d43c13dda13 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi51-293/+293
Change-Id: I26e3d71cda02349758640b768dd6f6d5de409e16 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi11-15/+15
Change-Id: I097175e88d15296e3fd6d4dd509c1772fca5b205 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I8012f93f10a2f247d4c2dbb270354b70ee439a8c Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi77-38/+70570
Change-Id: Ie5a174ef8475a2c177cd1c098b8e7f6e1a1fc434 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: Idadc0b16a50a3c99206fd48df6257fee974ae23e Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi2-4/+4
Change-Id: If38c5e5a5a379435e8caa210285e82b5a1e9f0a2 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi4-4/+4
Change-Id: Ice670b3d9733dd964baa6ccefa0e30ea6b4ff47c Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi49-260/+260
Change-Id: If8da6bcff727ffb7c7a158beaef620b32c39b2e9 Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi9-13/+13
Change-Id: Ibeb07137f35b5ed16c55d74ff0fb5429b435075a Auto-generated-cl: translation import
2016-08-15Import translations. DO NOT MERGEBill Yi1-1/+1
Change-Id: I3de404141d9557e3afe74746df8fa66b1f863f2a Auto-generated-cl: translation import