diff options
author | Neil Fuller <nfuller@google.com> | 2015-04-01 19:13:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 19:13:29 +0000 |
commit | 57df23e40a55a31dc8c0d084dde7a7d52cac7621 (patch) | |
tree | b1793b194a14daa9d063f3984115deded8994fc1 /core/tasks | |
parent | 521a8dbd186710d8e68ce8853822edc44ecaa0d9 (diff) | |
parent | 080d2f32add01c513913ec50acd9defee9cb7dfa (diff) | |
download | build-57df23e40a55a31dc8c0d084dde7a7d52cac7621.tar.gz build-57df23e40a55a31dc8c0d084dde7a7d52cac7621.tar.bz2 build-57df23e40a55a31dc8c0d084dde7a7d52cac7621.zip |
am 080d2f32: am 2e4c6762: am 2ff6a3bb: Merge "Add explicit dependency on tzdata_updates_intermediates for CTS"
* commit '080d2f32add01c513913ec50acd9defee9cb7dfa':
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 a8d42d460..acaaa296c 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -172,7 +172,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) |