-
Brian Carlstrom authored
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
302e330b