diff options
| author | Neil Fuller <nfuller@google.com> | 2015-04-01 18:05:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 18:05:28 +0000 |
| commit | 080d2f32add01c513913ec50acd9defee9cb7dfa (patch) | |
| tree | f1035303f6fcee011096fbdeb10281d0a2b255f9 /core/tasks | |
| parent | 93d46584170a9aae1728cdb9010eef41e25b4d4a (diff) | |
| parent | 2e4c67624c7f7d071d93d734cda024acea759582 (diff) | |
| download | build-080d2f32add01c513913ec50acd9defee9cb7dfa.zip build-080d2f32add01c513913ec50acd9defee9cb7dfa.tar.gz build-080d2f32add01c513913ec50acd9defee9cb7dfa.tar.bz2 | |
am 2e4c6762: am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
* commit '2e4c67624c7f7d071d93d734cda024acea759582':
Add explicit dependency on tzdata_updates_intermediates for CTS
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/cts.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 1fdb296..ee17444 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -168,7 +168,7 @@ $(CTS_CORE_XMLS): PRIVATE_CLASSPATH:=$(GEN_CLASSPATH) # build system requires that dependencies use javalib.jar. If # javalib.jar is up-to-date, then classes.jar is as well. Depending # on classes.jar will build the files incorrectly. -CTS_CORE_XMLS_DEPS := $(CTS_CORE_CASES) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(JUNIT_HOST_JAR) $(CORE_INTERMEDIATES)/javalib.jar $(BOUNCYCASTLE_INTERMEDIATES)/javalib.jar $(APACHEXML_INTERMEDIATES)/javalib.jar $(APACHEHARMONYTESTS_INTERMEDIATES)/javalib.jar $(OKHTTP_INTERMEDIATES)/javalib.jar $(OKHTTPTESTS_INTERMEDIATES)/javalib.jar $(OKHTTP_REPACKAGED_INTERMEDIATES)/javalib.jar $(SQLITEJDBC_INTERMEDIATES)/javalib.jar $(JUNIT_INTERMEDIATES)/javalib.jar $(CORETESTS_INTERMEDIATES)/javalib.jar $(JSR166TESTS_INTERMEDIATES)/javalib.jar $(CONSCRYPTTESTS_INTERMEDIATES)/javalib.jar build/core/tasks/cts.mk | $(ACP) +CTS_CORE_XMLS_DEPS := $(CTS_CORE_CASES) $(HOST_OUT_JAVA_LIBRARIES)/descGen.jar $(JUNIT_HOST_JAR) $(CORE_INTERMEDIATES)/javalib.jar $(BOUNCYCASTLE_INTERMEDIATES)/javalib.jar $(APACHEXML_INTERMEDIATES)/javalib.jar $(APACHEHARMONYTESTS_INTERMEDIATES)/javalib.jar $(OKHTTP_INTERMEDIATES)/javalib.jar $(OKHTTPTESTS_INTERMEDIATES)/javalib.jar $(OKHTTP_REPACKAGED_INTERMEDIATES)/javalib.jar $(SQLITEJDBC_INTERMEDIATES)/javalib.jar $(JUNIT_INTERMEDIATES)/javalib.jar $(CORETESTS_INTERMEDIATES)/javalib.jar $(JSR166TESTS_INTERMEDIATES)/javalib.jar $(CONSCRYPTTESTS_INTERMEDIATES)/javalib.jar $(TZDATAUPDATETESTS_INTERMEDIATES)/javalib.jar build/core/tasks/cts.mk | $(ACP) $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.dalvik.xml: $(CTS_CORE_XMLS_DEPS) $(hide) mkdir -p $(CTS_TESTCASES_OUT) |