Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b362d4 authored by dcashman's avatar dcashman
Browse files

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: 214a1714)

Bug: 19566396
Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa
parent 480a9bb6

core/tasks/cts.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -92,8 +92,7 @@ CTS_CASE_LIST_JARS := 
$(foreach m, $(CTS_TEST_JAR_LIST),\

$(foreach m, $(CTS_TEST_JAR_LIST),\

  $(eval CTS_CASE_LIST_JARS += $(CTS_TESTCASES_OUT)/$(m).jar))

  $(eval CTS_CASE_LIST_JARS += $(CTS_TESTCASES_OUT)/$(m).jar))





CTS_SHARED_LIBS := \

CTS_SHARED_LIBS :=

	$(HOST_LIBRARY_PATH)/libc++$(HOST_SHLIB_SUFFIX)





DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans

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)

$(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)