summaryrefslogtreecommitdiffstats
path: root/JavaLibrary.mk
Commit message (Collapse)AuthorAgeFilesLines
* Get rid of rule to generate a file with a # in its name.Narayan Kamath2015-01-211-15/+0
| | | | | | | | | Was only around to work around perforce issues, and we have a copy of this file checked in anyway. Also, gets rid of an unused constant referencing the name. Change-Id: Iddd5871130d779455f8ff960703945dc1d745e18
* Only bother building the host tests for Linux.Elliott Hughes2015-01-161-0/+4
| | | | | | It's the only place you can run the host tests anyway. Change-Id: I5fe2b5b74e70a17696baf8ceaacaf4fca52d71ca
* Removing differences between AOSP and internalNeil Fuller2014-09-041-4/+6
| | | | | | | | | | | These commits were equivalent but not exactly the same: AOSP commit: adb19b9b603ba83ba49b1a10b6301e396132bf3b Internal commit: 18e74061b760389a94439f4b14acb376809a44ce This commit makes the internal files the same as AOSP to make future diffs easier. Change-Id: Ie2dcdd3940244c6dd18334b58037d2e8cca93920
* Dalvik is dead, long live Dalvik!Brian Carlstrom2014-08-051-28/+3
| | | | | | | | | | | | | | | | croot cd libcore repo start dalvik-is-dead-long-live-dalvik . repo sync -c . git rm -r libdvm git add JavaLibrary.mk (after removing libdvm references, adding explict core-libart references) git add Docs.mk (after replacing references to libdvm with libart) git add benchmarks/Android.mk (after adding explict core-libart references) git add Android.mk (after removing dalvik-host target) git commit -a -m 'Dalvik is dead, long live Dalvik!' Bug: 14298175 Change-Id: I977e7b4be8ef1043b70ceb8532ac4947ea1b7ab8
* Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-091-34/+31
| | | | | | | | | | Bug: 13751317 Fix the Mac host build: - conditionally define constants using pre-existing pattern, - make Posix calls that the Mac doesn't support throw UnsupportedOperationException. Change-Id: Ib68887cbe36ab167d042eb96c7834bce0651b078
* Remove reference to unused okhttp-test build targetNeil Fuller2014-05-291-1/+1
| | | | Change-Id: I8098a97d9ce59d77dc11793b484497d39884ca3d
* Revert "Revert "Do not dexopt core-libart""Brian Carlstrom2013-12-151-0/+6
| | | | This reverts commit 5ce66d51d2c5707789a82bb4b02c8dce94bbaf9c.
* Revert "Do not dexopt core-libart"Brian Carlstrom2013-12-111-6/+0
| | | | | | This reverts commit a8f7639cb7dee119543ed7db0c219e300c11e951. Change-Id: I5b5cda6db9de756f7b7aa01e5098b6737262fced
* Do not dexopt core-libartBrian Carlstrom2013-12-101-0/+6
| | | | Change-Id: I7571221096abbbc76c564033cd5a1c9f6d8553c4
* Better way to export variables in Docs.mk.Ying Wang2013-12-041-1/+1
| | | | | | | | With this change, libcore_to_document will be evaluated only once. As a side effect, this fixes the build log spam reported in: https://code.google.com/p/android/issues/detail?id=63184 Change-Id: I4fcfbcd70f6d4b119487525825aeafa2926507b4
* Remove incorrect LOCAL_NO_STANDARD_LIBRARIES flag.Narayan Kamath2013-11-251-1/+0
| | | | | | (cherry-picked from commit 115197d88b5ce8a4a25a6deaa172cd1848e4f9d6) Change-Id: Ie0f2d0b5fb88e6a507836db3609b4be53abb636b
* Remove uses of LOCAL_BUILD_HOST_DEXNarayan Kamath2013-11-251-11/+6
| | | | | | | | Use the new BUILD_HOST_DALVIK_JAVA_LIBRARY instead. (cherry picked from commit bb99b4971afcf5616ad0a3d2b8edaf3bd74d101b) Change-Id: If6822157b02126ede86b2e9cd4db11bdbae5b82b
* Merge commit '0a56e711dc7b1a310f57c58f5cb61add4808f713' into HEADThe Android Open Source Project2013-11-221-16/+30
|\ | | | | | | Change-Id: I883352e71c7d5f057764bdb822836023e57b6ba9
| * am d058512d: Merge "Split Conscrypt makefile out from libcore"Kenny Root2013-09-171-84/+0
| |\ | | | | | | | | | | | | * commit 'd058512d7f68bf4dbbd7775b879bc926c23816d0': Split Conscrypt makefile out from libcore
| * \ resolved conflicts for merge of e89c4900 to klp-dev-plus-aospKenny Root2013-08-301-1/+0
| |\ \ | | | | | | | | | | | | Change-Id: I78bbec3aed3abb5ee4d77aea7444d44484ce729f
| | * | Move support library to a separate static libraryKenny Root2013-08-301-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/base/core/tests/coretests uses the libcore/support/* classes for SSL-based tests. Instead of including core-tests itself, we need to split out the support classes to its own library to keep frameworks tests below the dex method limit. (cherry picked from commit b397b19a825d69e9122f1241849db726abae5413) Bug: 10092469 Change-Id: Ib9b1dd60cb778dba79afcbe3001749d82afa99d2
| * | | am 775e4d51: Merge "Move conscrypt out libjavacore and split tests"Kenny Root2013-08-301-8/+54
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '775e4d5147f8b53c0cae3fab622bb3c95deacaf5': Move conscrypt out libjavacore and split tests
| * \ \ \ am a0a63383: Merge "Revert "Revert "Change conscrypt-nojarjar to a static ↵Kenny Root2013-08-291-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | library""" * commit 'a0a63383693bfc083c7352994db3ed68865e8b9c': Revert "Revert "Change conscrypt-nojarjar to a static library""
| * \ \ \ \ resolved conflicts for merge of 932cf368 to klp-dev-plus-aospBrian Carlstrom2013-08-291-3/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I34643fc9fe299c582b29c8ffce19cc177d475abc
| * \ \ \ \ \ am 2f8af406: Merge "Revert "Change conscrypt-nojarjar to a static library""Kenny Root2013-08-291-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f8af406de5105e39dbd14792d3a45f73c58c149': Revert "Change conscrypt-nojarjar to a static library"
| * \ \ \ \ \ \ am 7eb201b9: Merge "Change conscrypt-nojarjar to a static library"Kenny Root2013-08-281-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7eb201b98925bcf50447e270d25f1f1a2243cc71': Change conscrypt-nojarjar to a static library
| * \ \ \ \ \ \ \ am a534d500: Merge "create a separate lib for jsr166. Bug: 10390711"Brian Carlstrom2013-08-231-0/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a534d5004e8ef8bfab280b3027b6bb9934da8a31': create a separate lib for jsr166. Bug: 10390711
| * \ \ \ \ \ \ \ \ am b76fb72d: Merge "Temporarily don\'t place jsr166 tests in coretests."Elliott Hughes2013-08-191-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b76fb72d22fb0a202ba543856d38899bb4ace8c7': Temporarily don't place jsr166 tests in coretests.
| * \ \ \ \ \ \ \ \ \ am 58e672ed: Merge "Added jsr166 tck tests as part of the libcore testsuite."Elliott Hughes2013-08-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58e672ed9af6e07968d3ee11036916e374877516': Added jsr166 tck tests as part of the libcore testsuite.
| * | | | | | | | | | Add make rule for dex.Tsu Chiang Chuang2013-07-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2807095462667f6d2b3723b315d5365c77a60931
| * | | | | | | | | | Add core-libart.jar alongside core.jarBrian Carlstrom2013-06-251-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c241d6b44265edd9a9606626b697148f77571f0
| * | | | | | | | | | Adding libart support to libcoreBrian Carlstrom2013-05-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I86febf08eacf42bb4b2f06dbd51c5b2d5b25c9fb
* | | | | | | | | | | Harmonize sources across core-tests and core-tests-hostdexNarayan Kamath2013-11-151-2/+3
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I450b13e714cf68310bf53e2fe740e9ecaac44576
* | | | | | | | | | Split Conscrypt makefile out from libcoreKenny Root2013-09-161-84/+0
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c12a0e038a86b186b5d88b9f0ff28b8480b4aed
* | | | | | | | | Move conscrypt out libjavacore and split testsKenny Root2013-08-301-8/+54
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make the situation with testing a little better and enable building core libraries totally independent of conscrypt, move the native registration to a JNI_OnLoad scheme. Also, since we want to separate the testing, make conscrypt build its own tests library. Change-Id: I9f2831839059c1c012ec7bdeab2f90b4e2f44bfd
* | | | | | | | Revert "Revert "Change conscrypt-nojarjar to a static library""Kenny Root2013-08-291-3/+3
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit aae2e51f245328652c00c95004f394ff360e2fb8. Split the support library out of core-tests so the frameworks tests don't go over the method limit. Change-Id: Ib177a41b9965f213d325964e9723bfdfba2c5b99
* | | | | | | Move support library to a separate static libraryKenny Root2013-08-291-3/+18
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/base/core/tests/coretests uses the libcore/support/* classes for SSL-based tests. Instead of including core-tests itself, we need to split out the support classes to its own library to keep frameworks tests below the dex method limit. Change-Id: Ic11dbd1c6f897af10c6cfe47efb977018ef2ad9a
* | | | | | Revert "Change conscrypt-nojarjar to a static library"Kenny Root2013-08-291-3/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | FrameworksCoreTests is too bloated now. Revert this. This reverts commit 69314139247afa971dedc262b5a5fd1cf891d132.
* | | | | Change conscrypt-nojarjar to a static libraryKenny Root2013-08-281-3/+3
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This doesn't need to be a shared library, so we can just use a static library. Change-Id: I6fb1a652d22fd4434f28f408142f1daefbbd0005
* | | | create a separate lib for jsr166.Tsu Chiang Chuang2013-08-231-0/+13
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Bug: 10390711 (cherry picked from commit d47cd7206917560c7f522ede128490819a96b143) Change-Id: I2646530dad175e2efe81b3f926a4d78a901f76ee
* | | Temporarily don't place jsr166 tests in coretests.Ian Rogers2013-08-191-1/+1
| |/ |/| | | | | | | | | | | | | | | Build fix. We're over the dex method reference limit. Removes part of commit 8f0d92bba199d906c70a5e40d7f3516c1a424117. (cherry-pick of 5f17cb094449b2667f0fca5988da6f5b103161f9.) Change-Id: If47b84c0baf2621e59ab262a0f9c088d98f5e33f
* | Added jsr166 tck tests as part of the libcore testsuite.Calin Juravle2013-08-141-1/+1
| | | | | | | | Change-Id: I6094d734f818fa043f2b277cf2b4ec7fec68e26e
* | Add make rule for dex.Tsu Chiang Chuang2013-07-241-0/+6
|/ | | | | | (cherry-picked from commit 6f567f2bcbd07375c723e03c994a7c7674f42c7e) Change-Id: If3c7122d7a6e914d4a21a33d0dddcc234bb5089e
* Move some files with dalvik dependencies to libdvmBrian Carlstrom2013-05-131-0/+1
| | | | Change-Id: I04498d8d8c4b065dbda8d7b30b8b77ce53e63a77
* Move dex utilities from dalvik/dx to libcore/dex part 2Jesse Wilson2013-04-301-1/+1
| | | | | Change-Id: Ib5bb7bec80d77464f632f1cdfef708d868301c42 (cherry picked from commit 9ae95d8f3381204108abc722e8e5a03d6ecbf311)
* Move JSSE to new packageKenny Root2013-04-291-5/+56
| | | | | | | | To help with shipping the JSSE with apps that want to bundle it, move it to a new package so that the tangles in other parts of the library can be untangled. Change-Id: I810b6861388635301e28aee5b9b47b8e6b35b430
* Merge "Move the external/apache-harmony/math tests into libcore."Elliott Hughes2013-04-061-1/+1
|\
| * Move the external/apache-harmony/math tests into libcore.Elliott Hughes2013-04-041-1/+1
| | | | | | | | Change-Id: Ic4acfcf8553e0108e6ad127afa2745bb551acba3
* | Switch to OkHttp as URL's preferred HTTP implementation.jwilson2013-04-031-3/+3
|/ | | | Change-Id: Id724b75dd78b68ed00f5db4989c4070896996ec0
* Implement UTS #35 5-count date format patterns.Elliott Hughes2013-02-071-5/+5
| | | | | Bug: https://code.google.com/p/android/issues/detail?id=39616 Change-Id: I8143f75abc25b2f839a3e44ab800ad90ff9b9029
* Track rename of mockwebserver-hostdex to mockwebserver-hostBrian Carlstrom2013-01-171-1/+1
| | | | Change-Id: I2122f8c7d69f4d8837d5a677599d33cb32b24f2a
* Add NIST PKIX tests to core-tests and knownfailuresKenny Root2013-01-171-2/+2
| | | | | Bug: 8030138 Change-Id: Ib29438238a21e20c4f039660d76ded2b96bed492
* am 44d48b2d: Merge "Improve the ↵Elliott Hughes2012-11-081-1/+1
|\ | | | | | | | | | | | | System.currentTimeMillis/Date/DateFormat/SimpleDateFormat documentation." * commit '44d48b2df506de9077e91b3e4f3356e41d961323': Improve the System.currentTimeMillis/Date/DateFormat/SimpleDateFormat documentation.
| * Improve the System.currentTimeMillis/Date/DateFormat/SimpleDateFormat ↵Elliott Hughes2012-11-081-1/+1
| | | | | | | | | | | | | | | | documentation. 15 years later, this stuff is still causing confusion. Change-Id: Id68d43014b72de2cf620cf1798517106fd68d229
* | am ca5c576d: Merge "Fix LIBCORE_SKIP_TESTS without causing warnings."Elliott Hughes2012-10-181-1/+4
|\ \ | |/ | | | | | | * commit 'ca5c576d5863496bf81eb8916ea5c03f5b12fd90': Fix LIBCORE_SKIP_TESTS without causing warnings.
generated by cgit v1.1 at 2025-01-10 05:49:18 +0000