diff options
| author | dcashman <dcashman@google.com> | 2015-05-12 11:31:09 -0700 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2015-05-13 11:31:25 -0700 |
| commit | 49b362d4b8cd30b02be10acda5191de60054afbb (patch) | |
| tree | bed4103ab1a2b69a429574f9c57f41d403318604 /core | |
| parent | 480a9bb64e127bff863e6c357d3bd4c3dabfbb57 (diff) | |
| download | build-49b362d4b8cd30b02be10acda5191de60054afbb.zip build-49b362d4b8cd30b02be10acda5191de60054afbb.tar.gz build-49b362d4b8cd30b02be10acda5191de60054afbb.tar.bz2 | |
Remove libc++ from prepackaged shared libs in cts.
Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of
sepolicy-analyze on libc++, eliminating the only consumer of the library for the
cts host-side tests. Remove the library since it is no longer needed but leave
the ability to add other shared libs in the future.
(cherry-pick of commit: 214a171424cea488f0a5c042cf18f56550693570)
Bug: 19566396
Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
Diffstat (limited to 'core')
| -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) |