| 61a124188040f84b5c237c338ec0ce7d3da75ed0 |
|
29-Aug-2013 |
Kenny Root <kroot@google.com> |
Move conscrypt out libjavacore and split tests
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.
(cherry picked from commit ba07db54a902e6741cd085901264e4e45c9c844e)
Bug: 10092469
Change-Id: Ie0e9b73d05236a9bd02fbb66cb1a5da4ec34df45
|
| a7cf230b11ad925558d07674a768c8851a8d71bf |
|
29-Aug-2013 |
Kenny Root <kroot@google.com> |
Change conscrypt-nojarjar to a static library
This doesn't need to be a shared library, so we can just use a static
library.
(cherry picked from commit 69314139247afa971dedc262b5a5fd1cf891d132)
Bug: 10092469
Change-Id: I3c57ca8594a4d3efcfd5d9d2aea01c13ee555dd7
|
| 4616c7f802521312349adec76e10f4a5b612223e |
|
29-Aug-2013 |
Kenny Root <kroot@google.com> |
Move support library to a separate static library
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
|
| 25963aedcfbeaa3e1c93fc916dc1575a1dcdce7a |
|
24-Jul-2013 |
Tsu Chiang Chuang <tsu@google.com> |
Add make rule for dex.
(cherry-picked from commit 6f567f2bcbd07375c723e03c994a7c7674f42c7e)
Change-Id: If3c7122d7a6e914d4a21a33d0dddcc234bb5089e
|
| 6f567f2bcbd07375c723e03c994a7c7674f42c7e |
|
24-Jul-2013 |
Tsu Chiang Chuang <tsu@google.com> |
Add make rule for dex.
Change-Id: I2807095462667f6d2b3723b315d5365c77a60931
|
| 3711c2119dc25aed312081a77dc028504bd482e1 |
|
26-Jun-2013 |
Brian Carlstrom <bdc@google.com> |
Add core-libart.jar alongside core.jar
Change-Id: I4c241d6b44265edd9a9606626b697148f77571f0
|
| 2cf03dc15c40b92634ff606694af5a6e9aa4db09 |
|
22-May-2013 |
Brian Carlstrom <bdc@google.com> |
Adding libart support to libcore
Change-Id: I86febf08eacf42bb4b2f06dbd51c5b2d5b25c9fb
|
| 895bba44ff59d2225532a1fe9842c8b9a70a9f9a |
|
13-May-2013 |
Brian Carlstrom <bdc@google.com> |
Move some files with dalvik dependencies to libdvm
Change-Id: I04498d8d8c4b065dbda8d7b30b8b77ce53e63a77
|
| 2bea5ee615b0f4add658d5660bd81c5145a0d05e |
|
18-Sep-2011 |
Jesse Wilson <jessewilson@google.com> |
Move dex utilities from dalvik/dx to libcore/dex part 2
Change-Id: Ib5bb7bec80d77464f632f1cdfef708d868301c42
(cherry picked from commit 9ae95d8f3381204108abc722e8e5a03d6ecbf311)
|
| 38375a4d0b3d34e2babbd2f6a013976c7c439696 |
|
24-Apr-2013 |
Kenny Root <kroot@google.com> |
Move JSSE to new package
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
|
| 81ccea015ba3d2a2da1c641b14dd3713c6b40a76 |
|
05-Apr-2013 |
Elliott Hughes <enh@google.com> |
Move the external/apache-harmony/math tests into libcore.
Change-Id: Ic4acfcf8553e0108e6ad127afa2745bb551acba3
|
| 2503556d17b28c7b4e6e514540a77df1627857d0 |
|
30-Mar-2013 |
jwilson <jwilson@squareup.com> |
Switch to OkHttp as URL's preferred HTTP implementation.
Change-Id: Id724b75dd78b68ed00f5db4989c4070896996ec0
|
| 92fc63ea7bdfcca72203ba0d183a43df0765cf79 |
|
08-Feb-2013 |
Elliott Hughes <enh@google.com> |
Implement UTS #35 5-count date format patterns.
Bug: https://code.google.com/p/android/issues/detail?id=39616
Change-Id: I8143f75abc25b2f839a3e44ab800ad90ff9b9029
|
| 22a12c91eade02f4bbbead512a63a1c322adecb2 |
|
18-Jan-2013 |
Brian Carlstrom <bdc@google.com> |
Track rename of mockwebserver-hostdex to mockwebserver-host
Change-Id: I2122f8c7d69f4d8837d5a677599d33cb32b24f2a
|
| a96f0f8f2a20d6776fdcaf420fe654c4f9f06ae0 |
|
18-Jan-2013 |
Kenny Root <kroot@google.com> |
Add NIST PKIX tests to core-tests and knownfailures
Bug: 8030138
Change-Id: Ib29438238a21e20c4f039660d76ded2b96bed492
|
| b98632738dfc72ba32ae0160eada03a97a303288 |
|
08-Nov-2012 |
Elliott Hughes <enh@google.com> |
Improve the System.currentTimeMillis/Date/DateFormat/SimpleDateFormat documentation.
15 years later, this stuff is still causing confusion.
Change-Id: Id68d43014b72de2cf620cf1798517106fd68d229
|
| c5cd6e8f15ce352d009a0d12291e14f321b76d11 |
|
19-Oct-2012 |
Elliott Hughes <enh@google.com> |
Fix LIBCORE_SKIP_TESTS without causing warnings.
Change-Id: I45609998bf46d6937a041b9fb25200a98a026b04
|
| 055fe87bc2435e657dfa6a443060a61665d6e0f3 |
|
18-Oct-2012 |
Elliott Hughes <enh@google.com> |
Make libcore's dependency on the tzdata explicit.
Bug: 7012465
Change-Id: I85469606cd9bae8c5ebd742ac781d82c5af9c6c0
|
| 73d3e262ecf514ef17f47da335fdad899aecc3dc |
|
29-Aug-2012 |
Elliott Hughes <enh@google.com> |
Add dependencies on the makefiles.
I've been enjoying this in bionic for a while now, and was annoyed
not to have make do the right thing in libcore.
Change-Id: Idcd2db48349202259887499a1f47d85c5d205d54
|
| 507504c19919db8be7da16203601341b144b9e27 |
|
23-Aug-2012 |
Ying Wang <wangying@google.com> |
Fix build warning.
(cherry-picked from e79ac583cf570e66762c93c9bdfea14fd5c6249a)
Change-Id: I76cc3e709606b9e58e2f5c639207ffb53462905b
|
| e79ac583cf570e66762c93c9bdfea14fd5c6249a |
|
23-Aug-2012 |
Ying Wang <wangying@google.com> |
Fix build warning.
Change-Id: I931bf7b28fbefaa247f96122f823b712d0c9396f
|
| ff053c366fd8277f02773b1c0a6489ad67a794f1 |
|
22-Aug-2012 |
Ying Wang <wangying@google.com> |
Remove obsolete variables.
Bug: 6987838
- Now emma is only enabled for apks.
- Global var EMMA_INSTRUMENT_STATIC tells to build emma as static
library to each module with emma enabled.
Change-Id: I1f3831ca3bbb3bc4fcc3c049fe80993a5cdc177a
|
| 17cdf1ac454247016f338d84be763789e6416100 |
|
14-Apr-2012 |
Brett Chabot <brettchabot@android.com> |
Remove junit source from libcore.
Will be replaced with library built from external/junit.
Bug 5826326
Change-Id: I78518a04b57bade113b1797a808ec1a39bd82ad7
|
| 09336c914b4fc813e493acc82469b9ad89fd8694 |
|
07-Jun-2011 |
Jesse Wilson <jessewilson@google.com> |
Use external/mockwebserver in libcore
Change-Id: I4dac34f88b23484643bce31e5f25ac6eb1fea426
|
| 43624e7f4cfd03e0425ad4a4ce818e403900b0d1 |
|
07-Jun-2011 |
Ying Wang <wangying@google.com> |
Quote the filename before passing to jar.
Jar arg list file can not handle correctly if file name with "#" in it
is not quoted.
Also change to use a module specific tmp directory, instead of out/tmp.
Change-Id: I2b73f0826f845381a8457f0d342c736bea33a7c2
|
| 5b989a4848adb9de45ebb7b3bb96fa4586c18f99 |
|
28-Apr-2011 |
Elliott Hughes <enh@google.com> |
Remove --core-libraries from the core-tests make rules.
I think this was left in by accident from the days when we had tests in the
same package as the classes they were testing.
Change-Id: I45901714c33007aba139b22bfb7b660f038a1883
|
| cfa84a2aac159bb8a1763298882df7aa98f7fc6f |
|
24-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
Import SamplingProfiler from http://code.google.com/p/dalvik/
cp ~/android/dalvik/profiler/src/main/java/dalvik/profiler/* ~/android/master/libcore/dalvik/src/main/java/dalvik/system/profiler/
cp ~/android/dalvik/profiler/src/test/java/dalvik/profiler/* ~/android/master/libcore/dalvik/src/test/java/dalvik/system/profiler/
perl -p -i -e 's/package dalvik.profiler;/package dalvik.system.profiler;/' ~/android/master/libcore/dalvik/src/*/java/dalvik/system/profiler/*.java
perl -p -i -e 's/import dalvik.profiler./import dalvik.system.profiler./' ~/android/master/libcore/dalvik/src/*/java/dalvik/system/profiler/*.java
Change-Id: Iae3f63327f4a9dde7f037e69c22057e2ea704aaa
|
| 37a816a09d0b075033bf81c7787a5037430f430d |
|
18-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
Move sqlite-jdbc to be a static library
Change-Id: If02a0973eb7ba0291a75397dda5f221b810890de
|
| b5d9f82ac737ab4a464ba1506713572dea3d5f9d |
|
18-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
Remove sqlite-jdbc sources that moved to external/javasqlite
Change-Id: I1782aa53b05b959100c9fe3a55a718121e3b0f58
|
| 8ea4e0c4fd5fa778f8f9fac620e05216337b3b22 |
|
07-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
Remove unused core-junitrunner
Change-Id: I825ef2ed2fa3b277c12566f0e900e86d3e140cbb
|
| d39b1d6298afe1cf6364d4d118596045005c8688 |
|
07-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
"m dalvik-host" for quick minimal host build
Change-Id: I9df312fc2f887372e3fdb35863fa572020eb36f2
|
| 302e330bfcd86f54e43c0d4d73c3fadfc334240a |
|
02-Mar-2011 |
Brian Carlstrom <bdc@google.com> |
Removing cts dependency on AllTests for running core-tests
Summary:
- rewrote CollectAllTests to not depend on now deleted AllTests
- flattened core-tests into one static jar (enh)
- used static lib in cts build process
Details:
build
allow static libraries to contain resources
used by core-tests module
core/java_library.mk
collapse CTS_CORE_CASE_LIST to android.core.tests.libcore
change generate-core-test-description to take a jar of tests to run instead of an AllTests class name
move common options from callers of generate-core-test-description to its definition
updated classpath for running generate-core-test-description for libcore tests
core/tasks/cts.mk
cts
Restore temporarily disabled cts build
tests/core/Android.mk
Updated BUILD_CTSCORE_PACKAGE
- don't overwrite LOCAL_STATIC_JAVA_LIBRARIES, just append to it so we can use a static library to build android.core.tests.libcore
- clarify some comments
- change some @ to $(hide) to clarify operations in showcommands
- update rules now that input is a static library
tests/core/ctscore.mk
New android.core.tests.libcore built from static core-tests library
Note dummy file is necessary for build to process static library into an APK.
I first tried to change build to allow a package with only a static library
but it would require changing how static libraries are packed in to APK,
which right now is done at the time Java sources are compiled.
tests/core/libcore/Android.mk
tests/core/libcore/AndroidManifest.xml
tests/core/libcore/src/Dummy.java
Removing old core-tests packages
tests/core/dom/Android.mk
tests/core/dom/AndroidManifest.xml
tests/core/luni-io/Android.mk
tests/core/luni-io/AndroidManifest.xml
tests/core/luni-lang/Android.mk
tests/core/luni-lang/AndroidManifest.xml
tests/core/luni-net/Android.mk
tests/core/luni-net/AndroidManifest.xml
tests/core/luni-util/Android.mk
tests/core/luni-util/AndroidManifest.xml
tests/core/xml/Android.mk
tests/core/xml/AndroidManifest.xml
Rewrite of logic in CollectAllTests for finding tests to run.
Previously it acted as a JUnit TestRunner for a specific TestSuite,
with the runner modified to do no-op runs just to collect the names of tests.
Now it takes a jar file argument and walks the entries looking for TestCase
classes and then walking the methods to find the tests.
tools/utils/CollectAllTests.java
libcore
fix all-test-java-files-under to work like all-main-java-files-under (to support multiple directories)
flatten separate core-tests-* into core-tests
make core-tests a static Java library, avoiding dex overhead (which will only now be done when building CTS packages)
remove old RI core-tests.jar build which seems obsolete given our use of vogar
removd core-tests-supportlib since core-tests can now be used in its place
JavaLibrary.mk
frameworks/base
Change tracking move from core-tests-supportlib to core-tests
core/tests/coretests/Android.mk
Change-Id: Id5d965dd96d257544ce27a1e0fcde65901e9c573
|
| d610834e0a53866778efdab2a529e7c2f9a75dc9 |
|
22-Feb-2011 |
Elliott Hughes <enh@google.com> |
Build everything with -encoding UTF-8, as we intended.
Change-Id: I9c83326d36232233b86891a607e8c581c1b0d27a
|
| e590b9c7ecbe9b35c33fd2d101b1abc6bd7d1489 |
|
14-Jan-2011 |
Jesse Wilson <jessewilson@google.com> |
Move apache-xml to external. (project 2 of 4)
Change-Id: I1ac2e099f4b8c5002e24eb18a3b14cdc193e610f
http://b/3351604
|
| f029395dff382fc4dcba0689fd948ec06644e1f0 |
|
10-Jan-2011 |
Jesse Wilson <jessewilson@google.com> |
Break dependency from libcore to Apache XML libraries.
Change-Id: I482ba29551423c682696db44f78bc6b74fa04341
http://b/1414929
|
| dc3c15284f838a1330135249b7b8255b616b4670 |
|
06-Jan-2011 |
Brian Carlstrom <bdc@google.com> |
Add libcore-docs target
Add a local droiddoc target that cuts the review time for javadoc
changes from several minutes to less than a minute.
Docs.mk is the list of directories to javadoc within libcore that was
refactored from frameworks/base/Android.mk
Change-Id: I5c12b48e71b849c2883ebaafaddea5f6c6dea857
|
| 48d0b3ffb83c2d9f08d9f4debb09e9798cf67c6a |
|
14-Dec-2010 |
Elliott Hughes <enh@google.com> |
Building libcore in master is spam city. Fix that.
Actually, this is more of a workaround. The real fix would be:
1. work out why @SuppressWarnings("unchecked") isn't working.
2. move the XML crap (which we're not maintaining, and where we don't fix
warnings) out into external/.
3. uncomment the commented-out line in this patch.
(I've fixed our real non-"unchecked" warnings in earlier patches.)
Change-Id: I5a2dcb071eef5b46c8f166f9492d56cfdb5c6fa5
|
| 59498a6d868652afe491e95862bc19e186ad83a9 |
|
12-Oct-2010 |
Elliott Hughes <enh@google.com> |
Remove dead scripts.
Bug: 3087671
Change-Id: I95eb77ea66e289c9ea1c6106b4eb4654ca15215d
|
| 53fbc0a776feebcc04f6c24b34f2c7ba39e6b5a1 |
|
17-Sep-2010 |
Jesse Wilson <jessewilson@google.com> |
Add optional tags to libcore.
Change-Id: Iac339144ed448848c96852da8d301d528ebfa0e6
|
| f2678961b60cfe08d8b9aa1210cb75291496f83f |
|
14-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
make new module optional
Change-Id: Iadd023fbc4f11b10d1f76c92c1cfad7ff21dde97
|
| 7898a917ea805abf9f320ed42285ff3adf79968d |
|
14-Sep-2010 |
Jesse Wilson <jessewilson@google.com> |
Update the host core.jar build to include classes.dex.
Uses LOCAL_BUILD_HOST_DEX:=true to do the heavy lifting.
See Ying Wang's example, which this obsoletes:
https://android-git.corp.google.com/g/67581
Change-Id: I7ebfd7033e130280e473b1a42624c5d375d7eaed
|
| 51ee38b9c39b0c36bce728a797b2c5e637be3d2c |
|
24-Jul-2010 |
Brian Carlstrom <bdc@google.com> |
New Java-based SamplingProfiler
Summary:
- libcore: new Java based SamplingProfiler
- dalvik: remove old SamplingProfiler native bits
- frameworks/base: New placeholder SamplingProfilerIntegration
- vendor/google: remove old profiler snapshot parsing code
Details:
libcore
A new 100% Java SamplingProfiler. While it has more overhead that
the old native one, the new one can actually collect more than the
current PC and frame pointer, so you can get useful context of
where your app is spending time. It currently provides ASCII hprof
format output for use with tools like PerfAnal
dalvik/src/main/java/dalvik/system/SamplingProfiler.java
Unit test for the new SamplingProfiler
dalvik/src/test/java/dalvik/system/SamplingProfilerTest.java
Add core-tests-dalvik
JavaLibrary.mk
dalvik
Removing native code that supported the old SamplingProfiler
vm/Dvm.mk
vm/native/InternalNative.c
vm/native/dalvik_system_SamplingProfiler.c
frameworks/base
Placeholder SamplingProfilerIntegration. Later plans include
generating EventStackTrace protobufs.
New SamplingProfiler does not have a global instance, so
SamplingProfilerIntegration provides one in INSTANCE. Old binary
snapshot format is temporily replaced with ASCII hprof data.
core/java/com/android/internal/os/SamplingProfilerIntegration.java
Simplified interface for zygote profile snapshotting
core/java/com/android/internal/os/ZygoteInit.java
Current SamplingProfilerIntegration does not track event loop
explicitly, but hprof information does include thread information.
core/java/android/app/ActivityThread.java
vendor/google
Removing code for parsing old SamplingProfiler snapshot format
tools/samplingprofiler/Android.mk
tools/samplingprofiler/NOTICE
tools/samplingprofiler/profiler.iml
tools/samplingprofiler/profiler.ipr
tools/samplingprofiler/pull-snapshots.sh
tools/samplingprofiler/sorttable.js
tools/samplingprofiler/src/com/android/profiler/PrintHtml.java
|
| bb22f75bd3380dc9ed8bd45b03ad5ddf818ad1e8 |
|
24-Jul-2010 |
Brian Carlstrom <bdc@google.com> |
New Java-based SamplingProfiler
Summary:
- libcore: new Java based SamplingProfiler
- dalvik: remove old SamplingProfiler native bits
- frameworks/base: New placeholder SamplingProfilerIntegration
- vendor/google: remove old profiler snapshot parsing code
Details:
libcore
A new 100% Java SamplingProfiler. While it has more overhead that
the old native one, the new one can actually collect more than the
current PC and frame pointer, so you can get useful context of
where your app is spending time. It currently provides ASCII hprof
format output for use with tools like PerfAnal
dalvik/src/main/java/dalvik/system/SamplingProfiler.java
Unit test for the new SamplingProfiler
dalvik/src/test/java/dalvik/system/SamplingProfilerTest.java
Add core-tests-dalvik
JavaLibrary.mk
dalvik
Removing native code that supported the old SamplingProfiler
vm/Dvm.mk
vm/native/InternalNative.c
vm/native/dalvik_system_SamplingProfiler.c
frameworks/base
Placeholder SamplingProfilerIntegration. Later plans include
generating EventStackTrace protobufs.
New SamplingProfiler does not have a global instance, so
SamplingProfilerIntegration provides one in INSTANCE. Old binary
snapshot format is temporily replaced with ASCII hprof data.
core/java/com/android/internal/os/SamplingProfilerIntegration.java
Simplified interface for zygote profile snapshotting
core/java/com/android/internal/os/ZygoteInit.java
Current SamplingProfilerIntegration does not track event loop
explicitly, but hprof information does include thread information.
core/java/android/app/ActivityThread.java
vendor/google
Removing code for parsing old SamplingProfiler snapshot format
tools/samplingprofiler/Android.mk
tools/samplingprofiler/NOTICE
tools/samplingprofiler/profiler.iml
tools/samplingprofiler/profiler.ipr
tools/samplingprofiler/pull-snapshots.sh
tools/samplingprofiler/sorttable.js
tools/samplingprofiler/src/com/android/profiler/PrintHtml.java
Change-Id: I4a7d7b86b45a806021249c83ab32e52d3d53f33c
|
| 12cd1f00c2fa1a7f37bf644cecdf7588bdc0b0a9 |
|
23-Jun-2010 |
Brian Carlstrom <bdc@google.com> |
Remove libcore's dependency on bouncycastle
external/bouncycastle
- Change to be the primary build for bouncycastle sources (as opposed to part of libcore)
- Moved OpenSSLMessageDigest from libcore to OpenSSLDigest
It uses NativeCrypto API from core, but implements a bouncycastle specific interface
- restored registration of bouncycastle MessageDigests for SHA-1, SHA-256, MD5
OpenSSLProvider versions take precedence, but explicit provider of "BC" allows choice
- enabled native versions of SHA-384 and SHA-512
- pruned MD4 implementation
frameworks/base
- frameworks and CoreTests modules now depend on bouncycastle
- update preloades classes for NativeBN package change
- moved CryptoTest to libcore
libcore
- core now builds without bouncycastle sources
- core-tests, core-tests-support, core-tests-supportlib now depend on bouncycastle
- removed libcore/openssl directory, moving NativeBN to java/math
- minor cleanup of Provider, Security, Services style while working on ProviderTest
- added new OpenSSLProvider registered as first provider to have
priority over the others to ensure our native implementations are used
- moved BouncyCastle to have priority as a provider over Harmony
- JarVerifier and JarUtils now implicitly use OpenSSLMessageDigest
- Cleanedup OpenSSLSignature, implementation needs to be finished to move to OpenSSLProvider
- To avoid using PEMWriter from BouncyCastle, NativeCrypto now takes binary encoded certs and keys
This is more efficient as well avoiding the base64 decode/encode of the binary data
- removed SHA-224 to match the RI
packages/apps/CertInstaller
- CertificateInstaller module now depends on bouncycastle
this is the only app to depend on bouncycastle
system/core
- updated BOOTCLASSPATH
Change-Id: I6205366b12baec4331b4a76e2c85d8324bf64b2c
|
| 845cc0816af30c6753dee2fb33f8c3ece638bd66 |
|
17-Jun-2010 |
Brian Carlstrom <bdc@google.com> |
libcore/luni/src/main/java/org/bouncycastle moved to external/bouncycastle/src/main/java/org/bouncycastle
Change-Id: I288db1607ad6f45dea71e7496d4d94c9707779f6
|
| d0049c5d83546e28e091b6530bf5f0052da6a80a |
|
18-Jun-2010 |
Brian Carlstrom <bdc@google.com> |
Enable UTF-8 in libcore Java source
Bouncy Castle has UTF-8 javadoc, but we also want this for character examples
Change-Id: I734890ddafc49bcf2ce71c60947e9cf4c95712b2
|
| d3ae3dbba52b9eec408be9b2e74a9f93388d4202 |
|
17-Jun-2010 |
Brian Carlstrom <bdc@google.com> |
libcore/luni/src/main/java/org/bouncycastle moved to external/bouncycastle/src/main/java/org/bouncycastle
Change-Id: Ic8d81f1c057458e9fdf9b648c9d976a552b785b8
|
| 83244e5bec9d489a097251c3df8cd22b36f4f648 |
|
12-Jun-2010 |
Guang Zhu <guangzhu@google.com> |
update emma build path due to libcore location change
Change-Id: Ib9484dd4caca75ae662be9baa887adb387f583fc
|
| 706d53593cd8841d378dbe298a8d1940db1e71df |
|
09-Jun-2010 |
Jesse Wilson <jessewilson@google.com> |
Adding HTTPS and proxy support to our mock webserver.
Also exposing core-tests-support for use by tests in frameworks/base.
I'm not particularly happy about this, but it seems to be the best
way to share test support code between the two build targets.
Change-Id: I5e8dcac90fc5d9be791e46c2606498978212108e
|
| b094af3cdc9225356724ff4b4f431fb51f781594 |
|
29-May-2010 |
Brian Carlstrom <bdc@google.com> |
Rename core-tests-luni to core-tests-luni for cts dependency
Change-Id: I6a739028c4c7bcda12b905116166e119720e69c2
|
| 6ba9c6519c9b1681fdbd6f444917e19f359acc15 |
|
14-May-2010 |
Guang Zhu <guangzhu@google.com> |
manually squashing commits from master (DO NOT MERGE)
Change-Id: I4d4287a7d91ba39e97fd907eae9fd0c93e026d02
I8e65d375: no emma instrumentation on core-test
I09725483: include emma into core library on conditional flag
|
| 1708c119626a936797c7c9257af52cd629a28cbb |
|
14-May-2010 |
Jesse Wilson <jessewilson@google.com> |
Moving junit out of core.jar and into core-junit.jar.
Adapted from master:
https://android-git.corp.google.com/g/50612
Change-Id: I24cde108f1dd70532ff217545445cdc0b2650a48
|
| d5d3526b485a6d79ec06598540ce77c6f3698f01 |
|
13-May-2010 |
Jesse Wilson <jessewilson@google.com> |
DO NOT MERGE: Split test targets into different .jars for master.
This cherry picks the critical parts of enh's original change:
7ee3a061452c5a7e5c8e661219a1f08a14171858
This is a stopgap fix; eventually when dalvik-dev's changes
are committed to master this should be obsolete.
Change-Id: Ieb04253fb7387ffa37452992c8a5af739fbbc45f
|
| 32cfe9539e1cc988fa433c18c12a89a18afe1f55 |
|
05-May-2010 |
Jesse Wilson <jessewilson@google.com> |
Moving junit out of core.jar and into core-junit.jar.
Previously it wasn't possible to start a dalvikvm without
a copy of JUnit on the boot class path.
Change-Id: I52f924207efe0a115e69616111807c6738d1a17f
https://android-git.corp.google.com/g/#change,50609
https://android-git.corp.google.com/g/#change,50610
https://android-git.corp.google.com/g/#change,50611
|
| 6b811c5daec1b28e6f63b57f98a032236f2c3cf7 |
|
03-May-2010 |
Peter Hallam <peterhal@google.com> |
Merge awt-kernel, icu, luni-kernel, prefs, security-kernel, x-net into luni
Merge xml except xmlpull and kxml into luni
|
| 6e1c2a95596e3ea72b48c7b54395131acbeab1da |
|
30-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Adapt to new location of libcore
Change-Id: I0dcadda241e7fd2a7429f9dd43d1ff5e945e5467
|
| f69aac3c1697d31dbeda8a81d2b32bb8f48b6850 |
|
28-Apr-2010 |
Guang Zhu <guangzhu@google.com> |
no emma instrumentation on core-test
* applying emma instrumentation causes OOM in dx
* test packages don't need emma instrumentation anyway, it's the
package under test that needs to be processed by emma
Change-Id: I8e65d3750aae716c52fb98d0b8cd41a748344516
|
| cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd |
|
26-Apr-2010 |
Peter Hallam <peterhal@google.com> |
merge more modules into luni
|
| 3ff29eb11a241d58c54ecc84230bb0672f4aa148 |
|
23-Apr-2010 |
Peter Hallam <peterhal@google.com> |
More merging of nio into luni
Change-Id: Ib4356b3cd57490df8ff246ea6a4bc1c269ba848b
|
| 757a7942eed2b0aa457f8517a0259d2ac82c5b18 |
|
16-Apr-2010 |
Elliott Hughes <enh@google.com> |
Merge LocaleData and Resources, rename Resources to ICU.
Also move our ICU tests into our little tree of tests.
Bug: 2596471
Change-Id: I73b53d74c26ef9bf670f12cac58b51ba61eefead
|
| 709c24d3b00c9c84ab66213911be1292154fe0ef |
|
11-Mar-2010 |
Guang Zhu <guangzhu@google.com> |
include emma into core library on conditional flag
emma library is used for collecting code coverage. Current pain point is that
for collecting code coverage, developers either need to include emma as a
local static library, or change BOOTCLASSPATH to include emma which includes
hacking boot image and reflashing it.
With this change, emma will be integrated into core.jar if EMMA_INSTRUMENT flag
is on, so pushing the updated framework.jar and perform a runtime restart will
make emma globally available to all code coverage tests.
This change will only affect code coverage builds.
Change-Id: I097254835ef4817d068e8946ecbec60135e1f515
|
| b9cf9cb6d681614fe3aa282511a99c3ed3329fce |
|
26-Feb-2010 |
Elliott Hughes <enh@google.com> |
Break the sqlite JDBC driver out from our JDBC implementation.
The JDBC driver is from a different source
(http://www.ch-werner.de/javasqlite/overview-summary.html) and is only
really needed for testing.
Bug 2468870 asks that we don't eagerly register the native methods for
these classes. That bug is fixed by this change.
Bug 2198667 asks that we stop shipping this JDBC driver as part of the
base system. That bug is not addressed by this change: the classes and
native code are now in their own, separate, .jar and .so files -- so
they'll be easier to remove in future -- but for now those files are
still in /system/framework and /system/lib respectively.
Bug: 2468870
Bug: 2198667
|
| 3e951a59b52fd39b9bd432d5724b94cc7a23a9ec |
|
23-Feb-2010 |
Elliott Hughes <enh@google.com> |
Fix a stupid mistake in my earlier change.
(I removed the unused parameter from the wrong macro!)
|
| bf1ecf255af211d1657886a56fec2a4415c81517 |
|
22-Feb-2010 |
Elliott Hughes <enh@google.com> |
Adapt jesse's new json tests to the new build scheme.
|
| 67cc34b75c18ae7d02c90282cb8616b82e1d8fcb |
|
20-Feb-2010 |
Elliott Hughes <enh@google.com> |
Remove external/jsr305, external/guava, and external/caliper.
|
| 7ee3a061452c5a7e5c8e661219a1f08a14171858 |
|
19-Feb-2010 |
Elliott Hughes <enh@google.com> |
Resync a load of tests with upstream, make our build faster.
I started off with a mission to remove uses of dalvik.annotation.* (stuff
like @TestTargetNew and other useless junk that just makes it harder to
stay in sync with upstream). I wrote a script to go through tests showing
me the diff between what we have and what upstream has, thinking that in
cases where upstream has also added tests, I may as well pull them in at
the same time...
...but I didn't realize how close we were to having dx fill its 1.5GiB heap.
After trying various alternatives, I decided to bite the bullet and break
core-tests up into one .jar per module. This adds parallelism back into this,
the slowest part of our build. (I can do even better, but I'll do that in a
separate patch, preferably after we've merged recent changes from master.)
Only a couple of dependencies were problematic: the worthless TestSuiteFactory
which already contained a comment suggesting we get rid of it, and the fact
that some tests -- most notably the concurrent ones -- also contained main
methods that started the JUnit tty-based TestRunner.
(In the long run, we want to be running the harmony tests directly from a
pristine "svn co" of upstream, using DalvikRunner. But this will be a big
help in the meantime, and starts the work of getting our current copy of
the tests into a state where we can start to extract any meaningful
changes/additions we've made.)
|
| e75be427785cf47b8236558c96d86beb976802d7 |
|
09-Dec-2009 |
Jesse Wilson <jessewilson@google.com> |
Support running caliper with the jtreg runner. This is an early first look;
we'll need to fix a few things before the UI for this is nice.
|
| 6ac43c29e4f1918d40441178c22bfca7409101be |
|
25-Oct-2009 |
Dan Bornstein <danfuzz@android.com> |
Split libcore/Android.mk into two files, one for Java code and one for
native code, and make each have a set of rules for building on the host.
I also tightened up how sub.mk processing works and documented it
a little better.
Change-Id: I8a7a4c5697b2f22c4d69941dba381d6452200911
|