History log of /external/apache-harmony/Android.mk
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
8d6e266a70daab4e86018f9022aeb8c7e4da97f2 01-Sep-2014 Neil Fuller <nfuller@google.com> Fixing serialization compatibility tests for sql tests

The resources files were being loaded using the System
classloader, which is not useful for instrumentation CTS
tests: the app classloader is a direct child of the
boot classloader.

Also moving all sql resources beneath
com.android.org.apache instead of just org.apache.
The resource names used during tests are derived from the
fully-qualified names of the test classes. At build time
we re-package the test code by prepending "com.android."
to the "org.apache" using jarjar. This is probably to
avoid conflicts with other tests / support code that have
been moved to libcore/harmony-tests but retain their
original package name.

Also a small change to the .mk file to remove references
to packages that no longer exist.

Bug: 17342415

(cherry picked from commit 15d1c074b73c8d2b67404ff87c7096f43a60d7f3)

Change-Id: I952b9fa2f772384e41d968d117fb1ae115f8d3cc
/external/apache-harmony/Android.mk
8161f687dd51d9dcf3613474e9ec27b6ac5cf36c 19-Jun-2014 Brian Carlstrom <bdc@google.com> Switch from core to core-libart

Bug: 14298175
Change-Id: I1a1151e420541dca25b71930bb8a70e1792a0a17
/external/apache-harmony/Android.mk
3c75f3706cca16cbffad6fc3183e14ad892b40ba 12-Jun-2014 Ian Rogers <irogers@google.com> Remove deprecated WITH_HOST_DALVIK.

Bug: 13751317
Change-Id: Ic49c0e8eaa11fcdd8e03c8181f55c76f7219105f
/external/apache-harmony/Android.mk
144a6ad2689ba757fb4321ab4df3f18fa52f961e 18-Dec-2013 Narayan Kamath <narayan@google.com> Remove apache-harmony/archive.

All tests have been moved to libcore/harmony-tests

Change-Id: Idd075ef021b74930fc6d9539ac053dd614b98394
/external/apache-harmony/Android.mk
6c5e2026f536b6656e7e490ef76e094a79347163 07-Nov-2013 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 604700ad to dalvik-dev

Change-Id: I43f7defec41234ec6cfd294542cf6040b16583c3
5a31d1e1c92c5de0341a9eb2750da2a6a809e389 28-Oct-2013 Narayan Kamath <narayan@google.com> Remove use of LOCAL_BUILD_HOST_DEX

Use BUILD_HOST_DALVIK_JAVA_LIBRARY instead.

Change-Id: Icb517c6f13ceefb86aaa139244128f194ac3fa5a
/external/apache-harmony/Android.mk
c1b59743ace3e8667b5f67e4eca0683cdf23fa1c 14-Aug-2013 Brian Carlstrom <bdc@google.com> Merge remote-tracking branch 'goog/master' into merge-apache-harmony

Change-Id: I47221a2d19ffbc38a88c39a9a42062dd8bf5550e
c49ac190000faf476b7788d89a84f0087f0d4cf6 04-May-2013 Elliott Hughes <enh@google.com> Lose regex tests to libcore.

Change-Id: Ide29733de45e6daaf1eb438b64aa1856c29e19c2
/external/apache-harmony/Android.mk
4b03691c3cd99519ba2aa060a68a7a3740b778df 03-May-2013 Elliott Hughes <enh@google.com> Lose nio_char tests to libcore.

Change-Id: I5a4afd6feea4ddff32007e1046ce436f9e64615f
/external/apache-harmony/Android.mk
6a042ffafd95501cc9b90bb4cfd11b8a002df8bb 27-Apr-2013 Elliott Hughes <enh@google.com> Lose the nio tests to libcore.

Change-Id: I13d316683c7b029ea0a5b29c6f6032e7a4f316dd
/external/apache-harmony/Android.mk
4a8578c338f438ecd30dddce2945a650c1d0bc11 26-Apr-2013 Elliott Hughes <enh@google.com> Lose the annotation tests to libcore.

Change-Id: I1ed652fdca51cd1cf55fadd568855db5f958e320
/external/apache-harmony/Android.mk
cfc230a1756495b51e8f75edbe47823c90d1a647 05-Apr-2013 Elliott Hughes <enh@google.com> Lose the math tests to libcore.

Change-Id: Id4e34db7fb2e22d92234c69a0238e207ac5b08e6
/external/apache-harmony/Android.mk
838be900a5b9b610464688eb91b90c451895bbd3 10-Mar-2013 Brian Carlstrom <bdc@google.com> Removing LOCAL_MODULE_TAGS := tests

Change-Id: Id53d78e8bf4b3f3ab7f6d111a822ed227b938e83
/external/apache-harmony/Android.mk
b03c78a21f8be724d88630217b194f03733b753b 29-Oct-2012 Tsu Chiang Chuang <tsu@google.com> add jarjar rules to rename apache-harmony tests to avoid name collisions
when running tests.

Change-Id: I3020380c42b718bec95c91ecd4a5d29649e3a547
/external/apache-harmony/Android.mk
41217d3ed0b1782ea36b36d3a74b710b9f507342 25-Oct-2012 Tsu Chiang Chuang <tsu@google.com> Only include the resource files for the directories we care about.

Change-Id: Ifc3f84ddb4256c1c8dd0deb4ad138374ecff4709
/external/apache-harmony/Android.mk
f6a661a332e77c7074c6cbd864bd3a830be7074a 29-Aug-2012 Brian Carlstrom <bdc@google.com> Merge remote-tracking branch 'goog/master' into 'goog/dalvik-dev'

Change-Id: I0bdb083bf2b188e9d51c40ea50191385ddb45f33
db08d5168e51be52dd50e3bb9015fe69f106fb36 23-Aug-2012 Ying Wang <wangying@google.com> Fix build warning.

Change-Id: I27d3066053a6fb45485f37d57c066375714cc3c1
/external/apache-harmony/Android.mk
05aba2478427cb86445e79316943a038e536a224 22-Aug-2012 Ying Wang <wangying@google.com> Remove obsolete variables.

Bug: 6987838
Now emma is only enabled for apks.

Change-Id: I358f32d7b77283a1dbca1da16a94b291c35fd079
/external/apache-harmony/Android.mk
5f0a23683aa603d8c50b6dd071a565821b76067b 10-Dec-2011 Elliott Hughes <enh@google.com> Add harmony's jdwp tests.

Change-Id: I1c0e70cd9e07244fe422a4f77f3727b55ec28402
/external/apache-harmony/Android.mk
5a4ecd15a879353ab17c7910a445ab25c6462484 26-May-2011 Elliott Hughes <enh@google.com> Clean up the socket tests.

Change-Id: Ib96cc7a3309a3cc9550963a0eb257d3021fb4036
/external/apache-harmony/Android.mk
5242a4762f525d144b0b3c169daa245479cdadab 20-May-2011 Elliott Hughes <enh@google.com> Include the resource files too.

This should get more tests passing.

Change-Id: I4cf46ae8c35a13a0957122ffcf1f22f6d3fe28c2
/external/apache-harmony/Android.mk
916c0517aad98441bcdd6cec90bbba730a437d8b 18-May-2011 Elliott Hughes <enh@google.com> Get the java.sql and javax.sql tests building.

Change-Id: I56f224b9b7a8473ca1a7a473ca178a11f07847e7
/external/apache-harmony/Android.mk
b5ef8434979368b7f637c12bef92ced60afcfe26 18-May-2011 Elliott Hughes <enh@google.com> Get the java.beans tests working.

Mainly deletion of the cruft we don't implement.

Change-Id: I014df15889a7dd8915f4876e39ef3eba39d2de3a
/external/apache-harmony/Android.mk
fc95c99cfa4921fef424f3f411d013b821589e69 18-May-2011 Elliott Hughes <enh@google.com> Build luni tests too, remove all SecurityManager cruft.

HttpURLConnectionTest is the only brutal hack here; that needs reviewing in
comparison with the libcore tests to decide on a resolution.

Change-Id: I191379effd8c38b90d430c2e4d85cf30447c0077
/external/apache-harmony/Android.mk
9596fe6ef1527f4a4269e7be0f1f1f7df9079ee1 17-May-2011 Elliott Hughes <enh@google.com> Fix the name of the host(dex) module.

Change-Id: Ibc89df6ca31f877a6f30d5071e0d73a49edd7354
/external/apache-harmony/Android.mk
0fcbde4b054e157ddc38f29688fd0ab12f0549ce 17-May-2011 Elliott Hughes <enh@google.com> Fix host build.

Change-Id: Icb9578bc22e21adeea8dd5083933216aa2e6d696
/external/apache-harmony/Android.mk
e98fbf8686c5289bf03fe5c3de7ff82d3a77104d 28-Apr-2011 Elliott Hughes <enh@google.com> Get the harmony test suite building.

Support_Jetty needs to be rewritten in terms of MockWebServer. I've removed the
concurrent tests on the assumption that we'll keep those separate for now (and
that they won't be updated by harmony ever again, even though the true upstream
will).

I've removed all the 'main' methods (which add a dependency on code we don't
have), and I've added the harmony support tree, which was classlib/support
rather than classlib/modules/support, so didn't get included last time.

Change-Id: Ifba2d420bb1cc4c3e4ee76d6a8ee68e7cf846ed9
/external/apache-harmony/Android.mk