summaryrefslogtreecommitdiffstats
path: root/JavaLibrary.mk
Commit message (Collapse)AuthorAgeFilesLines
* Remove --core-libraries from the core-tests make rules.Elliott Hughes2011-04-281-2/+0
| | | | | | | 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
* resolved conflicts for merge of cfa84a2a to dalvik-devBrian Carlstrom2011-03-241-1/+1
|\ | | | | | | Change-Id: I7765cd4bf03f0b18e60848c30dcce30cbdd7c77b
| * Import SamplingProfiler from http://code.google.com/p/dalvik/Brian Carlstrom2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | 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
* | Move sqlite-jdbc to be a static libraryBrian Carlstrom2011-03-181-2/+4
| | | | | | | | Change-Id: If02a0973eb7ba0291a75397dda5f221b810890de
* | resolved conflicts for merge of b5d9f82a to dalvik-devBrian Carlstrom2011-03-171-21/+0
|\ \ | |/ | | | | Change-Id: Iad4368d3d4974406c610e432bb3dfde411135176
| * Remove sqlite-jdbc sources that moved to external/javasqliteBrian Carlstrom2011-03-171-11/+0
| | | | | | | | Change-Id: I1782aa53b05b959100c9fe3a55a718121e3b0f58
* | Remove unused core-junitrunnerBrian Carlstrom2011-03-071-13/+1
| | | | | | | | Change-Id: I825ef2ed2fa3b277c12566f0e900e86d3e140cbb
* | "m dalvik-host" for quick minimal host buildBrian Carlstrom2011-03-061-0/+36
| | | | | | | | Change-Id: I9df312fc2f887372e3fdb35863fa572020eb36f2
* | Removing cts dependency on AllTests for running core-testsBrian Carlstrom2011-03-021-119/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Build everything with -encoding UTF-8, as we intended.Elliott Hughes2011-02-221-0/+11
|/ | | | Change-Id: I9c83326d36232233b86891a607e8c581c1b0d27a
* Move apache-xml to external. (project 2 of 4)Jesse Wilson2011-01-131-1/+1
| | | | | Change-Id: I1ac2e099f4b8c5002e24eb18a3b14cdc193e610f http://b/3351604
* Break dependency from libcore to Apache XML libraries.Jesse Wilson2011-01-091-1/+1
| | | | | Change-Id: I482ba29551423c682696db44f78bc6b74fa04341 http://b/1414929
* Add libcore-docs targetBrian Carlstrom2011-01-051-0/+42
| | | | | | | | | | 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
* Building libcore in master is spam city. Fix that.Elliott Hughes2010-12-141-2/+5
| | | | | | | | | | | | | 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
* Remove dead scripts.Elliott Hughes2010-10-111-19/+0
| | | | | Bug: 3087671 Change-Id: I95eb77ea66e289c9ea1c6106b4eb4654ca15215d
* Add optional tags to libcore.Jesse Wilson2010-09-161-2/+4
| | | | Change-Id: Iac339144ed448848c96852da8d301d528ebfa0e6
* make new module optionalJean-Baptiste Queru2010-09-141-0/+1
| | | | Change-Id: Iadd023fbc4f11b10d1f76c92c1cfad7ff21dde97
* Update the host core.jar build to include classes.dex.Jesse Wilson2010-09-131-6/+8
| | | | | | | | | 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
* New Java-based SamplingProfilerBrian Carlstrom2010-09-011-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Remove libcore's dependency on bouncycastleBrian Carlstrom2010-06-261-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Enable UTF-8 in libcore Java sourceBrian Carlstrom2010-06-181-0/+1
| | | | | | Bouncy Castle has UTF-8 javadoc, but we also want this for character examples Change-Id: I734890ddafc49bcf2ce71c60947e9cf4c95712b2
* libcore/luni/src/main/java/org/bouncycastle moved to ↵Brian Carlstrom2010-06-171-1/+1
| | | | | | external/bouncycastle/src/main/java/org/bouncycastle Change-Id: Ic8d81f1c057458e9fdf9b648c9d976a552b785b8
* am 83244e5b: update emma build path due to libcore location changeGuang Zhu2010-06-131-2/+6
|\ | | | | | | | | | | | | Merge commit '83244e5bec9d489a097251c3df8cd22b36f4f648' into dalvik-dev * commit '83244e5bec9d489a097251c3df8cd22b36f4f648': update emma build path due to libcore location change
| * update emma build path due to libcore location changeGuang Zhu2010-06-111-2/+6
| | | | | | | | Change-Id: Ib9484dd4caca75ae662be9baa887adb387f583fc
* | Adding HTTPS and proxy support to our mock webserver.Jesse Wilson2010-06-101-0/+11
|/ | | | | | | | 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
* Rename core-tests-luni to core-tests-luni for cts dependencyBrian Carlstrom2010-05-281-1/+1
| | | | Change-Id: I6a739028c4c7bcda12b905116166e119720e69c2
* Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-masterBrian Carlstrom2010-05-281-235/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: JavaLibrary.mk luni/src/main/java/java/lang/System.java luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpURLConnectionImpl.java luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java luni/src/test/java/java/net/URLConnectionTest.java support/src/test/java/tests/TestSuiteFactory.java x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp Change-Id: I1038f749c8c9bd640aae7ca96627810936454883
| * Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-171-5/+25
| | | | | | | | | | | | | | Adapted from master: https://android-git.corp.google.com/g/50612 Change-Id: I24cde108f1dd70532ff217545445cdc0b2650a48
| * Merge awt-kernel, icu, luni-kernel, prefs, security-kernel, x-net into luniPeter Hallam2010-05-041-34/+1
| | | | | | | | Merge xml except xmlpull and kxml into luni
| * Adapt to new location of libcoreJean-Baptiste Queru2010-04-301-1/+1
| | | | | | | | Change-Id: I0dcadda241e7fd2a7429f9dd43d1ff5e945e5467
| * merge more modules into luniPeter Hallam2010-04-271-134/+3
| |
| * More merging of nio into luniPeter Hallam2010-04-231-12/+1
| | | | | | | | Change-Id: Ib4356b3cd57490df8ff246ea6a4bc1c269ba848b
| * am 7e3d5fcd: Merge "include emma into core library on conditional flag"Guang Zhu2010-04-201-0/+5
| |\ | | | | | | | | | | | | | | | | | | Merge commit '7e3d5fcddef15bf2dff71c2fe5ee794536819973' into dalvik-dev * commit '7e3d5fcddef15bf2dff71c2fe5ee794536819973': include emma into core library on conditional flag
| * | Merge LocaleData and Resources, rename Resources to ICU.Elliott Hughes2010-04-161-11/+0
| | | | | | | | | | | | | | | | | | | | | Also move our ICU tests into our little tree of tests. Bug: 2596471 Change-Id: I73b53d74c26ef9bf670f12cac58b51ba61eefead
| * | Break the sqlite JDBC driver out from our JDBC implementation.Elliott Hughes2010-02-261-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix a stupid mistake in my earlier change.Elliott Hughes2010-02-221-7/+5
| | | | | | | | | | | | (I removed the unused parameter from the wrong macro!)
| * | Adapt jesse's new json tests to the new build scheme.Elliott Hughes2010-02-221-8/+33
| | |
| * | Merge remote branch 'goog/master' into mmElliott Hughes2010-02-221-21/+21
| |\ \ | | | | | | | | | | | | | | | | Conflicts: libcore/JavaLibrary.mk
| * | | Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-191-25/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.)
* | | | DO NOT MERGE: Split test targets into different .jars for master.Jesse Wilson2010-05-121-30/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Moving junit out of core.jar and into core-junit.jar.Jesse Wilson2010-05-041-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | no emma instrumentation on core-testGuang Zhu2010-04-281-0/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | * 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
* | | include emma into core library on conditional flagGuang Zhu2010-03-111-0/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Remove external/jsr305, external/guava, and external/caliper.Elliott Hughes2010-02-191-2/+2
|/
* Support running caliper with the jtreg runner. This is an early first look;Jesse Wilson2009-12-101-1/+1
| | | | we'll need to fix a few things before the UI for this is nice.
* Split libcore/Android.mk into two files, one for Java code and one forDan Bornstein2009-10-261-0/+184
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
generated by cgit v1.1 at 2025-01-07 06:15:53 +0000