Merge "Revert "Add vts related artifacts to vts-core package"" am: fb42b79210
am: 7815818869
Change-Id: I60db7fb585bd76866a10fd4b6eb1b0e8d89f99f1
This commit is contained in:
commit
f60056f219
|
@ -12,15 +12,13 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
-include external/linux-kselftest/android/kselftest_test_list.mk
|
||||
-include external/ltp/android/ltp_package_list.mk
|
||||
|
||||
test_suite_name := vts
|
||||
test_suite_tradefed := vts-tradefed
|
||||
test_suite_readme := test/vts/tools/vts-core-tradefed/README
|
||||
|
||||
# TODO(b/149249068): Clean up after all VTS tests are converted.
|
||||
vts_test_artifact_paths :=
|
||||
# Some repo may not include vts project.
|
||||
-include test/vts/tools/build/tasks/framework/vts_for_core_suite.mk
|
||||
|
||||
# Copy kernel test modules to testcases directories
|
||||
kernel_test_host_out := $(HOST_OUT_TESTCASES)/vts_kernel_tests
|
||||
kernel_test_vts_out := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)/testcases/vts_kernel_tests
|
||||
|
@ -44,7 +42,6 @@ include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
|
|||
$(compatibility_zip): $(copy_kernel_tests)
|
||||
|
||||
.PHONY: vts
|
||||
$(compatibility_zip): $(vts_test_artifact_paths)
|
||||
vts: $(compatibility_zip)
|
||||
$(call dist-for-goals, vts, $(compatibility_zip))
|
||||
|
||||
|
|
Loading…
Reference in New Issue