diff options
| author | dcashman <dcashman@google.com> | 2015-05-13 18:36:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 18:38:18 +0000 |
| commit | c0ba40b8a17669b9938008f826cef88aa791c828 (patch) | |
| tree | 7a57e0ead825635a43b4261332268a0df9bec34b | |
| parent | 8788add72c093b16d9a2f301c3da71f0b328f3d1 (diff) | |
| parent | 49b362d4b8cd30b02be10acda5191de60054afbb (diff) | |
| download | build-c0ba40b8a17669b9938008f826cef88aa791c828.zip build-c0ba40b8a17669b9938008f826cef88aa791c828.tar.gz build-c0ba40b8a17669b9938008f826cef88aa791c828.tar.bz2 | |
Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-dev
| -rw-r--r-- | core/tasks/cts.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 668d5bb..c7e4ed6 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -92,8 +92,7 @@ CTS_CASE_LIST_JARS := $(foreach m, $(CTS_TEST_JAR_LIST),\ $(eval CTS_CASE_LIST_JARS += $(CTS_TESTCASES_OUT)/$(m).jar)) -CTS_SHARED_LIBS := \ - $(HOST_LIBRARY_PATH)/libc++$(HOST_SHLIB_SUFFIX) +CTS_SHARED_LIBS := DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans $(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(CTS_CASE_LIST_JARS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ADDITIONAL_TF_JARS) $(ACP) $(CTS_SHARED_LIBS) |